forked from finn/tinyboard
setup-spoke.sh: use docker.io and docker-compose instead of docker-compose-plugin for apt installs
This commit is contained in:
@@ -135,14 +135,22 @@ $PKG_INSTALL vim "$AUTOSSH_PKG" "$OPENSSH_PKG" git
|
|||||||
|
|
||||||
info "Installing Docker..."
|
info "Installing Docker..."
|
||||||
if ! command -v docker >/dev/null 2>&1; then
|
if ! command -v docker >/dev/null 2>&1; then
|
||||||
|
if [ "$PKG_MANAGER" = "apt" ]; then
|
||||||
|
$PKG_INSTALL docker.io docker-compose
|
||||||
|
else
|
||||||
curl -fsSL https://get.docker.com | bash
|
curl -fsSL https://get.docker.com | bash
|
||||||
|
fi
|
||||||
else
|
else
|
||||||
warn "Docker already installed, skipping."
|
warn "Docker already installed, skipping."
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if ! docker compose version >/dev/null 2>&1; then
|
if ! docker compose version >/dev/null 2>&1; then
|
||||||
|
if [ "$PKG_MANAGER" = "apt" ]; then
|
||||||
|
$PKG_INSTALL docker-compose
|
||||||
|
else
|
||||||
warn "docker compose not available — Docker install script should have included it."
|
warn "docker compose not available — Docker install script should have included it."
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
info "Adding $SPOKE_USER to docker group..."
|
info "Adding $SPOKE_USER to docker group..."
|
||||||
usermod -aG docker "$SPOKE_USER" 2>/dev/null || true
|
usermod -aG docker "$SPOKE_USER" 2>/dev/null || true
|
||||||
|
|||||||
Reference in New Issue
Block a user