forked from finn/tinyboard
fix docker compose v2 compatibility
This commit is contained in:
6
setup.sh
6
setup.sh
@@ -27,7 +27,7 @@ header "TinyBoard Spoke Setup"
|
|||||||
|
|
||||||
info "Installing packages..."
|
info "Installing packages..."
|
||||||
apt-get update -q
|
apt-get update -q
|
||||||
apt-get install -y -q vim autossh docker.io docker-compose git openssh-server
|
apt-get install -y -q vim autossh docker.io docker-compose-v2 git openssh-server
|
||||||
|
|
||||||
info "Adding armbian to docker group..."
|
info "Adding armbian to docker group..."
|
||||||
usermod -aG docker armbian 2>/dev/null || true
|
usermod -aG docker armbian 2>/dev/null || true
|
||||||
@@ -151,14 +151,14 @@ docker build \
|
|||||||
-t spoke-autossh .
|
-t spoke-autossh .
|
||||||
|
|
||||||
header "Starting Containers"
|
header "Starting Containers"
|
||||||
docker-compose up -d
|
docker compose up -d
|
||||||
info "Waiting for tunnel to establish..."
|
info "Waiting for tunnel to establish..."
|
||||||
sleep 6
|
sleep 6
|
||||||
|
|
||||||
LOGS=$(docker logs "${SPOKE_NAME}-autossh" 2>&1 || docker logs spoke-autossh 2>&1 || true)
|
LOGS=$(docker logs "${SPOKE_NAME}-autossh" 2>&1 || docker logs spoke-autossh 2>&1 || true)
|
||||||
if echo "$LOGS" | grep -q "remote port forwarding failed"; then
|
if echo "$LOGS" | grep -q "remote port forwarding failed"; then
|
||||||
warn "Tunnel failed — port $TUNNEL_PORT may have been taken between check and connect."
|
warn "Tunnel failed — port $TUNNEL_PORT may have been taken between check and connect."
|
||||||
warn "Try running: docker-compose down && docker-compose up -d"
|
warn "Try running: docker compose down && docker compose up -d"
|
||||||
warn "Or re-run this script."
|
warn "Or re-run this script."
|
||||||
else
|
else
|
||||||
info "Tunnel is up on port $TUNNEL_PORT."
|
info "Tunnel is up on port $TUNNEL_PORT."
|
||||||
|
|||||||
Reference in New Issue
Block a user