From 78aeaec1703f0ea663fd06183fd2d20c6813ba43 Mon Sep 17 00:00:00 2001 From: WangLX <519407855@qq.com> Date: Thu, 6 Aug 2026 17:20:43 +0800 Subject: [PATCH] fix: harden Docker repository bootstrap --- docs/DEPLOYMENT-RUNBOOK.md | 2 +- scripts/bootstrap-ubuntu-22.04.sh | 45 ++++++++++++++++++++++++++----- 2 files changed, 40 insertions(+), 7 deletions(-) diff --git a/docs/DEPLOYMENT-RUNBOOK.md b/docs/DEPLOYMENT-RUNBOOK.md index 39399c6..d743816 100644 --- a/docs/DEPLOYMENT-RUNBOOK.md +++ b/docs/DEPLOYMENT-RUNBOOK.md @@ -36,7 +36,7 @@ sudo TIMEZONE_NAME=Asia/Shanghai RUN_UPGRADE=1 \ ./scripts/bootstrap-ubuntu-22.04.sh ~~~ -脚本使用 Docker 官方 apt 仓库,不修改网络地址、不自动打开防火墙端口,也不会替代现场重启决策。若出现 /var/run/reboot-required,先记下结果,再重启并重新确认 IP、SSH、磁盘和 Docker。 +脚本使用 Docker 官方 apt 仓库,默认强制 IPv4、重试下载并校验官方 GPG 指纹;不修改网络地址、不自动打开防火墙端口,也不会替代现场重启决策。若出现 /var/run/reboot-required,先记下结果,再重启并重新确认 IP、SSH、磁盘和 Docker。 ## 3. 放置并核对源码 diff --git a/scripts/bootstrap-ubuntu-22.04.sh b/scripts/bootstrap-ubuntu-22.04.sh index e5c1f01..04d1850 100755 --- a/scripts/bootstrap-ubuntu-22.04.sh +++ b/scripts/bootstrap-ubuntu-22.04.sh @@ -20,6 +20,10 @@ fi timezone_name="${TIMEZONE_NAME:-Asia/Shanghai}" deploy_user="${DEPLOY_USER:-${SUDO_USER:-}}" +docker_repository_url="${DOCKER_REPOSITORY_URL:-https://download.docker.com/linux/ubuntu}" +docker_gpg_url="${DOCKER_GPG_URL:-${docker_repository_url}/gpg}" +docker_gpg_fingerprint="9DC858229FC7DD38854AE2D88D81803C0EBFCD88" +docker_force_ipv4="${DOCKER_FORCE_IPV4:-1}" "${sudo_command[@]}" timedatectl set-timezone "$timezone_name" "${sudo_command[@]}" apt-get update @@ -30,18 +34,47 @@ if [[ "${RUN_UPGRADE:-0}" == "1" ]]; then fi "${sudo_command[@]}" install -m 0755 -d /etc/apt/keyrings -curl -fsSL https://download.docker.com/linux/ubuntu/gpg \ - | "${sudo_command[@]}" gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg +docker_curl_options=( + --fail + --silent + --show-error + --location + --retry 5 + --retry-delay 2 + --retry-all-errors + --connect-timeout 10 + --max-time 90 +) +docker_apt_options=() +if [[ "$docker_force_ipv4" == "1" ]]; then + docker_curl_options+=(--ipv4) + docker_apt_options+=(-o Acquire::ForceIPv4=true) +fi + +docker_key_file="$(mktemp)" +trap 'rm -f "$docker_key_file"' EXIT +curl "${docker_curl_options[@]}" "$docker_gpg_url" --output "$docker_key_file" +downloaded_fingerprint="$( + gpg --batch --show-keys --with-colons "$docker_key_file" 2>/dev/null \ + | awk -F: '$1 == "fpr" { print $10; exit }' +)" +if [[ "$downloaded_fingerprint" != "$docker_gpg_fingerprint" ]]; then + printf 'Docker GPG fingerprint mismatch: expected %s, found %s.\n' \ + "$docker_gpg_fingerprint" "${downloaded_fingerprint:-unavailable}" >&2 + exit 1 +fi +"${sudo_command[@]}" gpg --dearmor --yes -o /etc/apt/keyrings/docker.gpg "$docker_key_file" "${sudo_command[@]}" chmod a+r /etc/apt/keyrings/docker.gpg architecture="$(dpkg --print-architecture)" codename="${VERSION_CODENAME}" -printf 'deb [arch=%s signed-by=/etc/apt/keyrings/docker.gpg] https://download.docker.com/linux/ubuntu %s stable\n' \ - "$architecture" "$codename" \ +printf 'deb [arch=%s signed-by=/etc/apt/keyrings/docker.gpg] %s %s stable\n' \ + "$architecture" "$docker_repository_url" "$codename" \ | "${sudo_command[@]}" tee /etc/apt/sources.list.d/docker.list >/dev/null -"${sudo_command[@]}" apt-get update -"${sudo_command[@]}" apt-get install -y docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin +"${sudo_command[@]}" apt-get "${docker_apt_options[@]}" update +"${sudo_command[@]}" apt-get "${docker_apt_options[@]}" install -y \ + docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin "${sudo_command[@]}" systemctl enable --now docker if [[ -n "$deploy_user" && "$deploy_user" != "root" ]]; then