fix(deploy): guard cd and split DOCKER_GID assignment (shellcheck)
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 16s
CI / ui (pull_request) Successful in 56s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m7s
CI / changes (pull_request) Successful in 2s
CI / unit (pull_request) Successful in 10s
CI / integration (pull_request) Successful in 16s
CI / ui (pull_request) Successful in 56s
CI / gate (pull_request) Successful in 0s
CI / deploy (pull_request) Successful in 1m7s
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.
This commit is contained in:
@@ -39,10 +39,11 @@ STATE_FILE="${STATE_FILE:-/opt/scrabble/DEPLOYED_TAG}"
|
|||||||
PG_USER="${POSTGRES_USER:-scrabble}"
|
PG_USER="${POSTGRES_USER:-scrabble}"
|
||||||
PG_DB="${POSTGRES_DB:-scrabble}"
|
PG_DB="${POSTGRES_DB:-scrabble}"
|
||||||
|
|
||||||
cd "$COMPOSE_DIR"
|
cd "$COMPOSE_DIR" || { echo "compose dir $COMPOSE_DIR missing"; exit 1; }
|
||||||
export REGISTRY
|
export REGISTRY
|
||||||
# otelcol joins the host docker group to read the socket; the GID varies per host.
|
# 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 "$@"; }
|
dc() { docker compose -f docker-compose.yml -f docker-compose.prod.yml "$@"; }
|
||||||
use_tag() { export TAG="$1"; }
|
use_tag() { export TAG="$1"; }
|
||||||
|
|||||||
Reference in New Issue
Block a user