From 04f8536dad4dc850c386cd3823f3ba87a0349ea8 Mon Sep 17 00:00:00 2001
From: whyour <imwhyour@gmail.com>
Date: Sun, 27 Oct 2024 00:17:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20debian=20=E7=89=88?=
 =?UTF-8?q?=E6=9C=AC=E4=B8=BA=2012=20bookworm?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 back/config/util.ts         | 4 ++--
 back/services/dependence.ts | 2 +-
 docker/310.Dockerfile       | 6 +++---
 docker/Dockerfile           | 6 +++---
 4 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/back/config/util.ts b/back/config/util.ts
index 3353114e..bcb98876 100644
--- a/back/config/util.ts
+++ b/back/config/util.ts
@@ -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(
diff --git a/back/services/dependence.ts b/back/services/dependence.ts
index 1d887657..42cf8861 100644
--- a/back/services/dependence.ts
+++ b/back/services/dependence.ts
@@ -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
diff --git a/docker/310.Dockerfile b/docker/310.Dockerfile
index d7fce102..66959dfd 100644
--- 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}"
@@ -43,7 +43,7 @@ RUN set -x && \
   nginx \
   jq \
   procps \
-  netcat \
+  netcat-openbsd \
   unzip \
   libatomic1 && \
   apt-get clean && \
diff --git a/docker/Dockerfile b/docker/Dockerfile
index 06b05ec8..d90c121e 100644
--- 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}"
@@ -44,7 +44,7 @@ RUN set -x && \
   nginx \
   jq \
   procps \
-  netcat \
+  netcat-openbsd \
   unzip \
   libatomic1 && \
   apt-get clean && \