From 4e1e9282acaf3478fd3494466dde19ab2e369f95 Mon Sep 17 00:00:00 2001 From: Justin Oros Date: Sun, 19 Apr 2026 12:37:19 -0700 Subject: [PATCH] setup-spoke.sh: use docker.io and docker-compose instead of docker-compose-plugin for apt installs --- spoke/setup-spoke.sh | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/spoke/setup-spoke.sh b/spoke/setup-spoke.sh index 8421375..cc92e6b 100755 --- a/spoke/setup-spoke.sh +++ b/spoke/setup-spoke.sh @@ -135,13 +135,21 @@ $PKG_INSTALL vim "$AUTOSSH_PKG" "$OPENSSH_PKG" git info "Installing Docker..." if ! command -v docker >/dev/null 2>&1; then - curl -fsSL https://get.docker.com | bash + if [ "$PKG_MANAGER" = "apt" ]; then + $PKG_INSTALL docker.io docker-compose + else + curl -fsSL https://get.docker.com | bash + fi else warn "Docker already installed, skipping." fi if ! docker compose version >/dev/null 2>&1; then - warn "docker compose not available — Docker install script should have included it." + if [ "$PKG_MANAGER" = "apt" ]; then + $PKG_INSTALL docker-compose + else + warn "docker compose not available — Docker install script should have included it." + fi fi info "Adding $SPOKE_USER to docker group..."