From 9f970495ee675ccbdb46bc322f14075f71e7e543 Mon Sep 17 00:00:00 2001 From: Ilia Denisov Date: Mon, 22 Jun 2026 00:35:20 +0200 Subject: [PATCH] fix(deploy): guard cd and split DOCKER_GID assignment (shellcheck) cd $COMPOSE_DIR now aborts on failure instead of deploying from the wrong dir; DOCKER_GID is declared then exported so the subshell exit isn't masked. --- deploy/prod-deploy.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/deploy/prod-deploy.sh b/deploy/prod-deploy.sh index aec789b..91a408e 100755 --- a/deploy/prod-deploy.sh +++ b/deploy/prod-deploy.sh @@ -39,10 +39,11 @@ STATE_FILE="${STATE_FILE:-/opt/scrabble/DEPLOYED_TAG}" PG_USER="${POSTGRES_USER:-scrabble}" PG_DB="${POSTGRES_DB:-scrabble}" -cd "$COMPOSE_DIR" +cd "$COMPOSE_DIR" || { echo "compose dir $COMPOSE_DIR missing"; exit 1; } export REGISTRY # otelcol joins the host docker group to read the socket; the GID varies per host. -export DOCKER_GID="$(getent group docker | cut -d: -f3)" +DOCKER_GID="$(getent group docker | cut -d: -f3)" +export DOCKER_GID dc() { docker compose -f docker-compose.yml -f docker-compose.prod.yml "$@"; } use_tag() { export TAG="$1"; }