From eaaa3b7251970339f3321e65c91902bdc6814c47 Mon Sep 17 00:00:00 2001 From: Marc Mintel Date: Sat, 13 Jun 2026 10:22:22 +0200 Subject: [PATCH] fix(ci): clean up stray docker containers on ssh deploy to prevent network delete failure --- .gitea/workflows/deploy.yml | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/.gitea/workflows/deploy.yml b/.gitea/workflows/deploy.yml index 8e0ae9b36..e38c88a56 100644 --- a/.gitea/workflows/deploy.yml +++ b/.gitea/workflows/deploy.yml @@ -363,6 +363,7 @@ jobs: env: ENV_FILE: ${{ needs.prepare.outputs.env_file }} run: | + SLUG=$(echo "${{ github.ref_name }}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//;s/-$//') mkdir -p ~/.ssh echo "${{ secrets.ALPHA_SSH_KEY }}" > ~/.ssh/id_ed25519 chmod 600 ~/.ssh/id_ed25519 @@ -375,7 +376,6 @@ jobs: elif [[ "$TARGET" == "staging" ]]; then SITE_DIR="/home/deploy/sites/staging.e-tib.com" else - SLUG=$(echo "${{ github.ref_name }}" | tr '[:upper:]' '[:lower:]' | sed 's/[^a-z0-9]/-/g' | sed 's/--*/-/g' | sed 's/^-//;s/-$//') SITE_DIR="/home/deploy/sites/branch.e-tib.com/$SLUG" fi @@ -384,6 +384,7 @@ jobs: scp docker-compose.yml root@alpha.mintel.me:$SITE_DIR/docker-compose.yml ssh root@alpha.mintel.me "docker system prune -f" + ssh root@alpha.mintel.me "docker rm -f \$(docker ps -a -q --filter name=${SLUG}-etib-) 2>/dev/null || true" ssh root@alpha.mintel.me "cd $SITE_DIR && echo '${{ secrets.REGISTRY_PASS }}' | docker login registry.infra.mintel.me -u '${{ secrets.REGISTRY_USER }}' --password-stdin" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' pull" ssh root@alpha.mintel.me "cd $SITE_DIR && docker compose -p '${{ needs.prepare.outputs.project_name }}' --env-file '$ENV_FILE' up -d --remove-orphans"