From 2469b94b1f03c495e5cd4f1f86e553928b077d45 Mon Sep 17 00:00:00 2001 From: jtricerolph Date: Wed, 1 Jul 2026 13:34:15 +0000 Subject: [PATCH] install_docker: idempotent (skip if present), non-interactive gpg --- install-stack.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/install-stack.sh b/install-stack.sh index 2f90403..6c659c5 100755 --- a/install-stack.sh +++ b/install-stack.sh @@ -389,11 +389,17 @@ install_docker() { local id=$1 pct exec "$id" -- bash -s &>/dev/null <<'DOCKER_INSTALL' export DEBIAN_FRONTEND=noninteractive +# Idempotent: if Docker's already here, just make sure it's running and bail. +if command -v docker >/dev/null 2>&1; then + systemctl enable --now docker ssh 2>/dev/null + exit 0 +fi apt-get update -qq 2>/dev/null apt-get install -y -qq ca-certificates curl gnupg git openssh-server 2>/dev/null install -m 0755 -d /etc/apt/keyrings +rm -f /etc/apt/keyrings/docker.gpg curl -fsSL https://download.docker.com/linux/ubuntu/gpg \ - | gpg --dearmor -o /etc/apt/keyrings/docker.gpg 2>/dev/null + | gpg --batch --yes --dearmor -o /etc/apt/keyrings/docker.gpg 2>/dev/null echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/docker.gpg] \ https://download.docker.com/linux/ubuntu jammy stable" \ > /etc/apt/sources.list.d/docker.list