fixed db lock
All checks were successful
ci/woodpecker/push/db Pipeline was successful

This commit is contained in:
Stephan D
2025-11-07 02:57:23 +01:00
parent df4af6c1e8
commit d68154f8ec
3 changed files with 10 additions and 6 deletions

View File

@@ -48,7 +48,7 @@ services:
sendico_db1:
<<: *common-env
image: ${REGISTRY_URL}/mirror/mongo:${MONGO_TAG}@${MONGO_DIGEST}
image: ${MONGO_IMAGE}
container_name: sendico_db1
restart: unless-stopped
depends_on: { vault-agent-sendico: { condition: service_healthy } }
@@ -70,7 +70,7 @@ services:
sendico_db2:
<<: *common-env
image: ${REGISTRY_URL}/mirror/mongo:${MONGO_TAG}@${MONGO_DIGEST}
image: ${MONGO_IMAGE}
container_name: sendico_db2
restart: unless-stopped
depends_on: { vault-agent-sendico: { condition: service_healthy } }
@@ -91,7 +91,7 @@ services:
sendico_db3:
<<: *common-env
image: ${REGISTRY_URL}/mirror/mongo:${MONGO_TAG}@${MONGO_DIGEST}
image: ${MONGO_IMAGE}
container_name: sendico_db3
restart: unless-stopped
depends_on: { vault-agent-sendico: { condition: service_healthy } }
@@ -112,7 +112,7 @@ services:
mongo_setup:
<<: *common-env
image: ${REGISTRY_URL}/mirror/mongo:${MONGO_TAG}@${MONGO_DIGEST}
image: ${MONGO_IMAGE}
depends_on:
sendico_db1: { condition: service_healthy }
sendico_db2: { condition: service_healthy }

View File

@@ -23,6 +23,7 @@ ssh -o StrictHostKeyChecking=no "$REMOTE_TARGET" REMOTE_DIR="$REMOTE_DIR" <<'EOS
. ../env/.env.lock.db
export REGISTRY_USER="$(cat ../env/.env.registry.user)"
export REGISTRY_PASS="$(cat ../env/.env.registry.pass)"
mkdir -p ~/.docker
echo "${REGISTRY_PASS}" | docker login "${REGISTRY_URL}" --username "${REGISTRY_USER}" --password-stdin >/dev/null
set +a
docker compose -f db.yml pull

View File

@@ -54,5 +54,8 @@ if [ -z "$DIGEST" ]; then
exit 1
fi
printf 'MONGO_TAG=%s\nMONGO_DIGEST=%s\n' "$APP_V" "$DIGEST" | tee .env.lock ci/prod/env/.env.lock.db
cat .env.lock
cat <<EOF | tee .env.lock ci/prod/env/.env.lock.db
MONGO_TAG=${APP_V}
MONGO_DIGEST=${DIGEST}
MONGO_IMAGE=${REGISTRY_URL}/mirror/mongo:${APP_V}@${DIGEST}
EOF