setup.sh: always install Docker, not only on first base run
The Docker check+install was inside the else branch that only runs when base has never been installed. On re-runs (base already present) Docker was silently skipped and only warned about. Move the check outside the if/else so Docker is always installed if missing, regardless of whether base was skipped. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01LQJBvqzXeyuhhAcAA3Q5Wq
This commit is contained in:
@@ -222,10 +222,13 @@ else
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
run_service base
|
run_service base
|
||||||
if ! command -v docker >/dev/null 2>&1; then
|
fi
|
||||||
log_warning "Docker is not installed. Containerized services need it."
|
|
||||||
echo " Install with: curl -fsSL https://get.docker.com | sh"
|
# Always ensure Docker is present — base may have been installed before Docker
|
||||||
fi
|
# was added to it, or a previous install may have failed.
|
||||||
|
if ! command -v docker &>/dev/null && ! [ -x /usr/bin/docker ]; then
|
||||||
|
log_info "Docker not found — installing now..."
|
||||||
|
require_docker
|
||||||
fi
|
fi
|
||||||
|
|
||||||
# 3) Offer site defaults wizard if .config has no SITE_TZ yet (first run).
|
# 3) Offer site defaults wizard if .config has no SITE_TZ yet (first run).
|
||||||
|
|||||||
Reference in New Issue
Block a user