open-source/qinglong
1
0
Fork 0
mirror of https://github.com/whyour/qinglong.git synced 2025-05-22 22:36:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

修改 debian 版本为 12 bookworm

Browse Source
This commit is contained in:
whyour 2024-10-27 00:17:33 +08:00
parent 7c3cd31e17
commit 04f8536dad
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
back/config/util.ts
View File

@ -655,7 +655,7 @@ async function _updateLinuxMirror(
let filePath: string, currentDomainWithScheme: string | null;
switch (osType) {
case 'Debian':
filePath = '/etc/apt/sources.list';
filePath = '/etc/apt/sources.list.d/debian.sources';
currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
if (currentDomainWithScheme) {
await replaceDomainInFile(
@ -668,7 +668,7 @@ async function _updateLinuxMirror(
throw Error(`Current mirror domain not found.`);
}
case 'Ubuntu':
filePath = '/etc/apt/sources.list';
filePath = '/etc/apt/sources.list.d/ubuntu.sources';
currentDomainWithScheme = await getCurrentMirrorDomain(filePath);
if (currentDomainWithScheme) {
await replaceDomainInFile(

2
back/services/dependence.ts
View File

@ -239,13 +239,13 @@ export default class DependenceService {
const isPythonDependence = dependency.type === DependenceTypes.python3;
const osType = await detectOS();
let linuxCommand = {} as typeof LINUX_DEPENDENCE_COMMAND.Alpine;
taskLimit.removeQueuedDependency(dependency);
if (isLinuxDependence) {
if (!osType) {
return resolve(null);
}
linuxCommand = LINUX_DEPENDENCE_COMMAND[osType];
}
taskLimit.removeQueuedDependency(dependency);
const depIds = [dependency.id!];
const status = isInstall

6
docker/310.Dockerfile
View File

@ -1,6 +1,6 @@
FROM node:20-slim AS nodebuilder
FROM python:3.10-slim-bullseye AS builder
FROM python:3.10-slim-bookworm AS builder
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@ -12,7 +12,7 @@ RUN set -x && \
cd /tmp/build && \
pnpm install --prod
FROM python:3.10-slim-bullseye
FROM python:3.10-slim-bookworm
ARG QL_MAINTAINER="whyour"
LABEL maintainer="${QL_MAINTAINER}"
@ -43,7 +43,7 @@ RUN set -x && \
nginx \
jq \
procps \
netcat \
netcat-openbsd \
unzip \
libatomic1 && \
apt-get clean && \

6
docker/Dockerfile
View File

@ -1,6 +1,6 @@
FROM node:20-slim AS nodebuilder
FROM python:3.11-slim-bullseye AS builder
FROM python:3.11-slim-bookworm AS builder
COPY package.json .npmrc pnpm-lock.yaml /tmp/build/
COPY --from=nodebuilder /usr/local/bin/node /usr/local/bin/
COPY --from=nodebuilder /usr/local/lib/node_modules/. /usr/local/lib/node_modules/
@ -12,7 +12,7 @@ RUN set -x && \
cd /tmp/build && \
pnpm install --prod
FROM python:3.11-slim-bullseye
FROM python:3.11-slim-bookworm
ARG QL_MAINTAINER="whyour"
LABEL maintainer="${QL_MAINTAINER}"
@ -44,7 +44,7 @@ RUN set -x && \
nginx \
jq \
procps \
netcat \
netcat-openbsd \
unzip \
libatomic1 && \
apt-get clean && \