修改 debian 版本为 12 bookworm

whyour · Dec 13, 2024 · 646d923 · 646d923
1 parent e118761
commit 646d923
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 9 deletions.
diff --git a/back/config/util.ts b/back/config/util.ts
@@ -625,7 +625,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(
@@ -638,7 +638,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(

diff --git a/back/services/dependence.ts b/back/services/dependence.ts
@@ -231,13 +231,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

diff --git a/docker/310.Dockerfile b/docker/310.Dockerfile
@@ -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}"
@@ -45,7 +45,7 @@ RUN set -x && \
   nginx \
   jq \
   procps \
-  netcat \
+  netcat-openbsd \
   unzip \
   libatomic1 && \
   apt-get clean && \

diff --git a/docker/Dockerfile b/docker/Dockerfile
@@ -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}"
@@ -46,7 +46,7 @@ RUN set -x && \
   nginx \
   jq \
   procps \
-  netcat \
+  netcat-openbsd \
   unzip \
   libatomic1 && \
   apt-get clean && \