From ccf5f8bbb65047cfb17e5b8b5e350364c8630bab Mon Sep 17 00:00:00 2001
From: Martin <1403951401@qq.com>
Date: Thu, 23 Jan 2025 15:16:11 +0800
Subject: [PATCH] =?UTF-8?q?[+]=20apt=20=E6=9A=82=E6=97=B6=E5=8E=BB?=
 =?UTF-8?q?=E9=99=A4docker=20=E7=A7=BB=E5=8A=A8=E5=88=B0=20docker=20?=
 =?UTF-8?q?=E4=B8=AD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 init-apt.sh    | 5 -----
 init-docker.sh | 6 ++++++
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/init-apt.sh b/init-apt.sh
index c909014..5d44009 100644
--- a/init-apt.sh
+++ b/init-apt.sh
@@ -11,11 +11,6 @@ if [ -f /etc/apt/sources.list.d/${lsb_dist}.sources ]; then
 fi
 # 配置镜像源
 echo "deb https://mirrors.martin98.com/repository/$lsb_dist $release $components" > /etc/apt/sources.list
-# docker
-if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
-    curl -fsSL https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
-fi
-echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $lsb_dist stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
 
 # 关闭交互式弹窗
 echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections
diff --git a/init-docker.sh b/init-docker.sh
index b8d63c0..d61c37b 100644
--- a/init-docker.sh
+++ b/init-docker.sh
@@ -17,6 +17,12 @@ if is_wsl; then
 elif command_exists docker; then
   echo "Docker 已安装.... 跳过安装"
 else
+  # docker
+  if [ ! -f /usr/share/keyrings/docker-archive-keyring.gpg ]; then
+      curl -fsSL https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist/gpg | gpg --dearmor -o /usr/share/keyrings/docker-archive-keyring.gpg
+  fi
+  echo "deb [signed-by=/usr/share/keyrings/docker-archive-keyring.gpg] https://mirrors.martin98.com/repository/docker-ce/linux/$lsb_dist $lsb_dist stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
+
   curl -sSL https://git.martin98.com/MartinFarm/init/raw/branch/main/docker-install.sh | sh
   cat > /etc/docker/daemon.json <<EOF
 {