[skip ci] chore: cleanup workflows

.github/workflows/deploy-geoip.yaml

@@ -5,9 +5,9 @@ on:
     branches:
       - main
     paths:
-      - fluxer_geoip/**/*
+      - fluxer_geoip/**
       - .github/workflows/deploy-geoip.yaml
-  workflow_dispatch:
+  workflow_dispatch: {}
 
 concurrency:
   group: deploy-fluxer-geoip
@@ -24,6 +24,13 @@ jobs:
     steps:
       - uses: actions/checkout@v6
 
+      - name: Record deploy commit
+        run: |
+          set -euo pipefail
+          sha=$(git rev-parse HEAD)
+          echo "Deploying commit ${sha}"
+          printf 'DEPLOY_SHA=%s\n' "$sha" >> "$GITHUB_ENV"
+
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
@@ -38,7 +45,7 @@ jobs:
         with:
           context: fluxer_geoip
           file: fluxer_geoip/Dockerfile
-          tags: fluxer-geoip:${{ github.sha }}
+          tags: fluxer-geoip:${{ env.DEPLOY_SHA }}
           load: true
           platforms: linux/amd64
           cache-from: type=gha,scope=deploy-fluxer-geoip
@@ -68,19 +75,20 @@ jobs:
 
       - name: Push image and deploy
         env:
-          IMAGE_TAG: fluxer-geoip:${{ github.sha }}
+          IMAGE_TAG: fluxer-geoip:${{ env.DEPLOY_SHA }}
           SERVER: ${{ secrets.SERVER_USER }}@${{ secrets.SERVER_IP }}
         run: |
           set -euo pipefail
-          docker pussh ${IMAGE_TAG} ${SERVER}
+          docker pussh "${IMAGE_TAG}" "${SERVER}"
 
-          ssh ${SERVER} bash << EOF
-            set -e
-            sudo mkdir -p /opt/fluxer-geoip
-            sudo chown -R \${USER}:\${USER} /opt/fluxer-geoip
-            cd /opt/fluxer-geoip
+          ssh "${SERVER}" "IMAGE_TAG=${IMAGE_TAG} bash" << 'EOF'
+          set -euo pipefail
 
-            cat > compose.yaml << 'COMPOSEEOF'
+          sudo mkdir -p /opt/fluxer-geoip
+          sudo chown -R "${USER}:${USER}" /opt/fluxer-geoip
+          cd /opt/fluxer-geoip
+
+          cat > compose.yaml << 'COMPOSEEOF'
           services:
             app:
               image: ${IMAGE_TAG}
@@ -112,6 +120,5 @@ jobs:
               external: true
           COMPOSEEOF
 
-            docker stack deploy -c compose.yaml fluxer-geoip
-            docker service update --image ${IMAGE_TAG} fluxer-geoip_app
+          docker stack deploy --with-registry-auth --detach=false --resolve-image never -c compose.yaml fluxer-geoip
           EOF