Updates

.woodpecker/deploy.yml

@@ -1,5 +1,5 @@
-# Deploy: build image, push to registry, trigger Portainer stack redeploy.
-# Runs on push/tag/manual to main only, after ci workflow succeeds.
+# Deploy: build qr-api and qr-web (multi-arch amd64 + arm64), push to registry, trigger Portainer stack redeploy.
+# Runs on push/tag/manual to main only, after CI workflow succeeds.
 when:
     - branch: main
       event: [push, tag, manual]
@@ -10,47 +10,15 @@ depends_on:
     - ci
 
 steps:
-    - name: Docker image build
+    - name: Docker image build (qr-api + qr-web, multi-arch)
       image: docker:latest
       environment:
-          REGISTRY_REPO: git.mifi.dev/mifi-holdings/shorty
-          DOCKER_API_VERSION: '1.43'
-          DOCKER_BUILDKIT: '1'
-      volumes:
-          - /var/run/docker.sock:/var/run/docker.sock
-      commands:
-          - set -e
-          - echo "=== Building Docker image (BuildKit) ==="
-          - 'echo "Commit SHA: ${CI_COMMIT_SHA:0:8}"'
-          - 'echo "Registry repo: $REGISTRY_REPO"'
-          - |
-              build() {
-                docker build \
-                  --progress=plain \
-                  --tag $REGISTRY_REPO:${CI_COMMIT_SHA} \
-                  --tag $REGISTRY_REPO:latest \
-                  --label "git.commit=${CI_COMMIT_SHA}" \
-                  --label "git.branch=${CI_COMMIT_BRANCH}" \
-                  .
-              }
-              for attempt in 1 2 3; do
-                echo "Build attempt $attempt/3"
-                if build; then
-                  echo "✓ Docker image built successfully"
-                  exit 0
-                fi
-                echo "Build attempt $attempt failed, retrying in 30s..."
-                sleep 30
-              done
-              echo "All build attempts failed"
-              exit 1
-
-    - name: Push to registry
-      image: docker:latest
-      environment:
-          DOCKER_API_VERSION: '1.43'
+          DOCKER_API_VERSION: "1.43"
+          DOCKER_BUILDKIT: "1"
+          BUILDKIT_PROGRESS: "plain"
           REGISTRY_URL: git.mifi.dev
-          REGISTRY_REPO: git.mifi.dev/mifi-holdings/shorty
+          REGISTRY_REPO_API: git.mifi.dev/mifi-holdings/shorty-qr-api
+          REGISTRY_REPO_WEB: git.mifi.dev/mifi-holdings/shorty-qr-web
           REGISTRY_USERNAME:
               from_secret: gitea_registry_username
           REGISTRY_PASSWORD:
@@ -59,18 +27,30 @@ steps:
           - /var/run/docker.sock:/var/run/docker.sock
       commands:
           - set -e
-          - echo "=== Pushing to registry ==="
-          - 'echo "Registry: $REGISTRY_URL"'
-          - 'echo "Repository: $REGISTRY_REPO"'
+          - echo "=== Multi-arch Docker build (amd64 + arm64) ==="
+          - 'echo "Commit SHA: ${CI_COMMIT_SHA:0:8}"'
           - |
-              echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_URL" \
-                -u "$REGISTRY_USERNAME" \
-                --password-stdin
-          - docker push $REGISTRY_REPO:${CI_COMMIT_SHA}
-          - docker push $REGISTRY_REPO:latest
-          - echo "✓ Images pushed successfully"
-      depends_on:
-          - Docker image build
+              apk add --no-cache git
+              docker buildx version || true
+              docker buildx create --name shorty-builder --use --driver docker-container 2>/dev/null || docker buildx use shorty-builder
+              echo "$REGISTRY_PASSWORD" | docker login "$REGISTRY_URL" -u "$REGISTRY_USERNAME" --password-stdin
+          - |
+              build_push() {
+                local ctx=$1
+                local repo=$2
+                docker buildx build \
+                  --platform linux/amd64,linux/arm64 \
+                  --progress=plain \
+                  --tag $repo:${CI_COMMIT_SHA} \
+                  --tag $repo:latest \
+                  --label "git.commit=${CI_COMMIT_SHA}" \
+                  --label "git.branch=${CI_COMMIT_BRANCH}" \
+                  --push \
+                  "$ctx"
+              }
+              build_push ./qr-api $REGISTRY_REPO_API
+              build_push ./qr-web $REGISTRY_REPO_WEB
+              echo "✓ Images built and pushed (multi-arch)"
 
     - name: Trigger Portainer stack redeploy
       image: curlimages/curl:latest
@@ -90,4 +70,4 @@ steps:
               fi
               echo "✓ Portainer redeploy triggered (HTTP $code)"
       depends_on:
-          - Push to registry
+          - Docker image build (qr-api + qr-web, multi-arch)