Update docker-ci.yml

Author: franzstimpfl

.github/workflows/docker-ci.yml

@@ -1,25 +1,88 @@
-name: Docker Image CI
+name: Docker CI + Deploy
 
 on:
   push:
-    branches: [ "main" ]
+    branches: ["main"]
   pull_request:
-    branches: [ "main" ]
+    branches: ["main"]
 
 jobs:
-
   build:
-
+    name: Build & Push Image
     runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v3
+
+      - name: Build the Docker image
+        run: |
+          docker build . \
+            --file Dockerfile \
+            --tag "git.local.skill17.com/${{ github.repository }}:latest"
 
+      - name: Docker login (registry)
+        env:
+          USER: ${{ secrets.USER }}
+          PASS: ${{ secrets.PASS }}
+        run: |
+          docker login -u "$USER" -p "$PASS" git.local.skill17.com
+
+      - name: Push image
+        run: |
+          docker push "git.local.skill17.com/${{ github.repository }}:latest"
+
+  deploy:
+    name: Deploy new version
+    needs: build
+    if: github.event_name == 'push' && github.ref == 'refs/heads/main'
+    runs-on: self-hosted
     steps:
-    - uses: actions/checkout@v3
-    - name: Build the Docker image
-      run: docker build . --file Dockerfile --tag git.local.skill17.com/${{ github.repository }}
-    - name: docker login
-      env:
-        USER: ${{ secrets.USER }}
-        PASS: ${{ secrets.PASS }}
-      run: docker login -u $USER -p $PASS git.local.skill17.com
-    - name: push to docker hub
-      run: docker push git.local.skill17.com/${{ github.repository }}
+      - name: Docker login (registry)
+        env:
+          USER: ${{ secrets.USER }}
+          PASS: ${{ secrets.PASS }}
+        run: |
+          docker login -u "$USER" -p "$PASS" git.local.skill17.com
+          
+      - name: Deploy new image
+        shell: bash
+        env:
+          GITEA_USER: ${{ secrets.USER }}
+          REPO: ${{ github.event.repository.name }}
+          COMPOSE_ROOT: /srv
+          COMPOSE_PROJECT: session
+        run: |
+          set -euo pipefail
+
+          USER="$GITEA_USER"
+          REPO="$REPO"
+          COMPOSE_ROOT="$COMPOSE_ROOT"
+
+          # Expected compose file name pattern:
+          # /srv/<GITEA_USER>_<anything>_<REPO>.yaml
+          mapfile -t CANDIDATES < <(
+            find "$COMPOSE_ROOT" -maxdepth 1 -type f -name "${USER}_*.yaml" -print | sort
+          )
+
+          if [ "${#CANDIDATES[@]}" -eq 0 ]; then
+            echo "No compose file found matching: ${COMPOSE_ROOT}/${USER}_*_${REPO}.yaml"
+            echo "Available yaml files:"
+            ls -1 "$COMPOSE_ROOT"/*.yaml 2>/dev/null | sed -n '1,200p' || true
+            exit 1
+          fi
+
+          if [ "${#CANDIDATES[@]}" -gt 1 ]; then
+            echo "Multiple compose files match (ambiguous):"
+            printf ' - %s\n' "${CANDIDATES[@]}"
+            exit 1
+          fi
+
+          COMPOSE_FILE="${CANDIDATES[0]}"
+          echo "Using compose file: $COMPOSE_FILE"
+
+          # Optional sanity check:
+          # IMAGE="git.taitaja2026.nstrim.app/${REPO}:latest"
+          # echo "Sanity check pull: $IMAGE"
+          # docker pull "$IMAGE"
+
+          docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" pull
+          docker compose -p "$COMPOSE_PROJECT" -f "$COMPOSE_FILE" up -d --force-recreate