From 6ceeb1011ccae2f547bfd08bf1afcd0da5ba96b2 Mon Sep 17 00:00:00 2001
From: Konano <nanoapezlk@gmail.com>
Date: Sun, 26 Apr 2026 16:55:47 +0800
Subject: [PATCH] feat: update docker and nginx source lists for installation

---
 configure_priv.sh                          | 13 ++++++++-----
 files/sources.list/docker-abroad.sources   |  6 ++++++
 files/sources.list/docker-internal.sources |  6 ++++++
 files/sources.list/nginx.sources           |  5 +++++
 4 files changed, 25 insertions(+), 5 deletions(-)
 create mode 100644 files/sources.list/docker-abroad.sources
 create mode 100644 files/sources.list/docker-internal.sources
 create mode 100644 files/sources.list/nginx.sources

diff --git a/configure_priv.sh b/configure_priv.sh
index b6e5474..03ed126 100755
--- a/configure_priv.sh
+++ b/configure_priv.sh
@@ -238,6 +238,7 @@ configure_tmux() {
 configure_docker() {
     command_exists docker && return
     [ $offline -eq 1 ] && return
+    [ "$(uname)" = "Darwin" ] && return
 
     if confirm_action "要安装 docker 吗？" "N"; then
         # 卸载旧版本
@@ -252,10 +253,12 @@ configure_docker() {
         # 添加软件源的 GPG 密钥，并向 sources.list 中添加 Docker 软件源
         if [ $abroad -eq 1 ]; then
             curl -fsSL https://download.docker.com/linux/ubuntu/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/docker-archive-keyring.gpg >/dev/null
-            echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://download.docker.com/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+            sudo rm -f /etc/apt/sources.list.d/docker.list
+            sed "s|__CODENAME__|$(lsb_release -cs)|g" "$scriptdir/files/sources.list/docker-abroad.sources" | sudo tee /etc/apt/sources.list.d/docker.sources >/dev/null
         else
             curl -fsSL https://mirrors.aliyun.com/docker-ce/linux/ubuntu/gpg | gpg --dearmor | sudo tee /usr/share/keyrings/docker-archive-keyring.gpg >/dev/null
-            echo "deb [arch=amd64 signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.aliyun.com/docker-ce/linux/ubuntu $(lsb_release -cs) stable" | sudo tee /etc/apt/sources.list.d/docker.list >/dev/null
+            sudo rm -f /etc/apt/sources.list.d/docker.list
+            sed "s|__CODENAME__|$(lsb_release -cs)|g" "$scriptdir/files/sources.list/docker-internal.sources" | sudo tee /etc/apt/sources.list.d/docker.sources >/dev/null
         fi
         sudo apt-get update
         sudo apt-get install docker-ce docker-ce-cli containerd.io -y
@@ -310,10 +313,10 @@ configure_mongodb() {
 
 configure_nginx() {
     [ $offline -eq 1 ] && return
-    if [ ! -f /etc/apt/sources.list.d/nginx.list ]; then
+    if [ ! -f /etc/apt/sources.list.d/nginx.sources ]; then
         curl -fsSL https://nginx.org/keys/nginx_signing.key | gpg --dearmor | sudo tee /usr/share/keyrings/nginx.gpg >/dev/null
-        echo "deb [signed-by=/usr/share/keyrings/nginx.gpg] https://nginx.org/packages/ubuntu/ $(lsb_release -cs) nginx" | sudo tee /etc/apt/sources.list.d/nginx.list >/dev/null
-        echo "deb-src [signed-by=/usr/share/keyrings/nginx.gpg] https://nginx.org/packages/ubuntu/ $(lsb_release -cs) nginx" | sudo tee -a /etc/apt/sources.list.d/nginx.list >/dev/null
+        sudo rm -f /etc/apt/sources.list.d/nginx.list
+        sed "s|__CODENAME__|$(lsb_release -cs)|g" "$scriptdir/files/sources.list/nginx.sources" | sudo tee /etc/apt/sources.list.d/nginx.sources >/dev/null
     fi
     if confirm_action "要安装 nginx 吗？" "Y"; then
         if command_exists nginx && ! confirm_action "检测到旧版 nginx 的存在 ($(nginx -v 2>&1))，是否继续安装？" "N"; then
diff --git a/files/sources.list/docker-abroad.sources b/files/sources.list/docker-abroad.sources
new file mode 100644
index 0000000..aa5a2ab
--- /dev/null
+++ b/files/sources.list/docker-abroad.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://download.docker.com/linux/ubuntu
+Suites: __CODENAME__
+Components: stable
+Architectures: amd64
+Signed-By: /usr/share/keyrings/docker-archive-keyring.gpg
diff --git a/files/sources.list/docker-internal.sources b/files/sources.list/docker-internal.sources
new file mode 100644
index 0000000..1ff2c02
--- /dev/null
+++ b/files/sources.list/docker-internal.sources
@@ -0,0 +1,6 @@
+Types: deb
+URIs: https://mirrors.aliyun.com/docker-ce/linux/ubuntu
+Suites: __CODENAME__
+Components: stable
+Architectures: amd64
+Signed-By: /usr/share/keyrings/docker-archive-keyring.gpg
diff --git a/files/sources.list/nginx.sources b/files/sources.list/nginx.sources
new file mode 100644
index 0000000..34d4089
--- /dev/null
+++ b/files/sources.list/nginx.sources
@@ -0,0 +1,5 @@
+Types: deb deb-src
+URIs: https://nginx.org/packages/ubuntu/
+Suites: __CODENAME__
+Components: nginx
+Signed-By: /usr/share/keyrings/nginx.gpg