tech/sendico
2
0
Fork 0
Code Issues 22 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fixed docker login
All checks were successful
ci/woodpecker/push/db Pipeline was successful
Details

Browse Source
This commit is contained in:
Stephan D
2025-11-07 02:38:09 +01:00
parent c8494da642
commit dacd8a2115
2 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ci/prod/compose/db.yml
View File

@@ -126,7 +126,7 @@ services:
until mongosh --quiet --host sendico_db1 --port ${MONGO_PORT} --eval "db.adminCommand({ ping: 1 })"; do until mongosh --quiet --host sendico_db1 --port ${MONGO_PORT} --eval "db.adminCommand({ ping: 1 })"; do
echo "waiting for MongoDB…"; sleep 2; echo "waiting for MongoDB…"; sleep 2;
done done
mongosh --host sendico_db1 --port ${MONGO_PORT} -u "$u" -p "$p" --authenticationDatabase admin <<EOJS mongosh --host sendico_db1 --port ${MONGO_PORT} -u "$$u" -p "$$p" --authenticationDatabase admin <<'EOJS'
try { rs.status() } catch (e) { try { rs.status() } catch (e) {
rs.initiate({ rs.initiate({
_id: "${MONGO_REPLICA_SET}", _id: "${MONGO_REPLICA_SET}",
@@ -154,9 +154,9 @@ services:
command: | command: |
sh -lc ' sh -lc '
. /etc/backup/pbm.env . /etc/backup/pbm.env
U=$(cat /etc/backup/.u) ; P=$(cat /etc/backup/.p) U=$$(cat /etc/backup/.u) ; P=$$(cat /etc/backup/.p)
export AWS_EC2_METADATA_DISABLED=true export AWS_EC2_METADATA_DISABLED=true
export PBM_MONGODB_URI="mongodb://${U}:${P}@sendico_db1:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}" export PBM_MONGODB_URI="mongodb://$${U}:$${P}@sendico_db1:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}"
exec pbm-agent --config=/etc/backup/pbm-config.yaml exec pbm-agent --config=/etc/backup/pbm-config.yaml
' '
@@ -173,9 +173,9 @@ services:
command: | command: |
sh -lc ' sh -lc '
. /etc/backup/pbm.env . /etc/backup/pbm.env
U=$(cat /etc/backup/.u) ; P=$(cat /etc/backup/.p) U=$$(cat /etc/backup/.u) ; P=$$(cat /etc/backup/.p)
export AWS_EC2_METADATA_DISABLED=true export AWS_EC2_METADATA_DISABLED=true
export PBM_MONGODB_URI="mongodb://${U}:${P}@sendico_db2:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}" export PBM_MONGODB_URI="mongodb://$${U}:$${P}@sendico_db2:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}"
exec pbm-agent --config=/etc/backup/pbm-config.yaml exec pbm-agent --config=/etc/backup/pbm-config.yaml
' '
@@ -192,8 +192,8 @@ services:
command: | command: |
sh -lc ' sh -lc '
. /etc/backup/pbm.env . /etc/backup/pbm.env
U=$(cat /etc/backup/.u) ; P=$(cat /etc/backup/.p) U=$$(cat /etc/backup/.u) ; P=$$(cat /etc/backup/.p)
export AWS_EC2_METADATA_DISABLED=true export AWS_EC2_METADATA_DISABLED=true
export PBM_MONGODB_URI="mongodb://${U}:${P}@sendico_db3:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}" export PBM_MONGODB_URI="mongodb://$${U}:$${P}@sendico_db3:${MONGO_PORT}/?authSource=${MONGO_AUTH_SOURCE}&replicaSet=${MONGO_REPLICA_SET}"
exec pbm-agent --config=/etc/backup/pbm-config.yaml exec pbm-agent --config=/etc/backup/pbm-config.yaml
' '

5
ci/prod/scripts/deploy-db.sh
View File

@@ -12,6 +12,8 @@ ssh -o StrictHostKeyChecking=no "$REMOTE_TARGET" "mkdir -p ${REMOTE_DIR}/{compos
rsync -avz --delete ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/" rsync -avz --delete ci/prod/compose/ "$REMOTE_TARGET:${REMOTE_DIR}/compose/"
rsync -avz ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime" rsync -avz ci/prod/.env.runtime "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.runtime"
rsync -avz ci/prod/env/.env.lock.db "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.lock.db" rsync -avz ci/prod/env/.env.lock.db "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.lock.db"
rsync -avz secrets/REGISTRY_USER "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.registry.user"
rsync -avz secrets/REGISTRY_PASS "$REMOTE_TARGET:${REMOTE_DIR}/env/.env.registry.pass"
scp -o StrictHostKeyChecking=no .env.lock "$REMOTE_TARGET:${REMOTE_DIR}/.env.lock" scp -o StrictHostKeyChecking=no .env.lock "$REMOTE_TARGET:${REMOTE_DIR}/.env.lock"
ssh -o StrictHostKeyChecking=no "$REMOTE_TARGET" REMOTE_DIR="$REMOTE_DIR" <<'EOSSH' ssh -o StrictHostKeyChecking=no "$REMOTE_TARGET" REMOTE_DIR="$REMOTE_DIR" <<'EOSSH'
set -euo pipefail set -euo pipefail
@@ -19,6 +21,9 @@ ssh -o StrictHostKeyChecking=no "$REMOTE_TARGET" REMOTE_DIR="$REMOTE_DIR" <<'EOS
set -a set -a
. ../env/.env.runtime . ../env/.env.runtime
. ../env/.env.lock.db . ../env/.env.lock.db
export REGISTRY_USER="$(cat ../env/.env.registry.user)"
export REGISTRY_PASS="$(cat ../env/.env.registry.pass)"
echo "${REGISTRY_PASS}" | docker login "${REGISTRY_URL}" --username "${REGISTRY_USER}" --password-stdin >/dev/null
set +a set +a
docker compose -f db.yml pull docker compose -f db.yml pull
docker compose -f db.yml up -d --remove-orphans docker compose -f db.yml up -d --remove-orphans