fixes

2026-03-29 14:53:19 +02:00
parent 9473fc9f0f
commit 684f64889b
1 changed files with 72 additions and 42 deletions
@@ -1,50 +1,80 @@
-steps:
-  - name: Checkout
-    uses: actions/checkout@v4
+name: Build and Push Lunchtime Images (Kaniko)

-  - name: Compute image tags and auth
-    id: meta
-    shell: bash
-    run: |
-      SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
-      IMAGE_REPO="$REGISTRY/$IMAGE_NAMESPACE/lunchtime-web"
+on:
+  push:
+    branches:
+      - main
+      - master
+    tags:
+      - "v*"
+  workflow_dispatch:

-      # Prepare Kaniko destination arguments
-      FRONTEND_DESTS="--destination $IMAGE_REPO:frontend-$SHORT_SHA"
-      BACKEND_DESTS="--destination $IMAGE_REPO:backend-$SHORT_SHA"
+env:
+  REGISTRY: git.sgruber.at
+  IMAGE_NAMESPACE: lunchtime

-      if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
-        FRONTEND_DESTS="$FRONTEND_DESTS --destination $IMAGE_REPO:frontend-${GITHUB_REF_NAME}"
-        BACKEND_DESTS="$BACKEND_DESTS --destination $IMAGE_REPO:backend-${GITHUB_REF_NAME}"
-      fi
+jobs:
+  build-and-push:
+    runs-on: ubuntu-latest
+    
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4

-      if [[ "$GITHUB_REF_NAME" == "main" || "$GITHUB_REF_NAME" == "master" ]]; then
-        FRONTEND_DESTS="$FRONTEND_DESTS --destination $IMAGE_REPO:frontend-latest"
-        BACKEND_DESTS="$BACKEND_DESTS --destination $IMAGE_REPO:backend-latest"
-      fi
+      - name: Compute image tags and auth
+        id: meta
+        shell: bash
+        run: |
+          SHORT_SHA=$(echo $GITHUB_SHA | cut -c1-7)
+          IMAGE_REPO="$REGISTRY/$IMAGE_NAMESPACE/lunchtime-web"

-      # Generate Base64 credentials
-      AUTH_B64=$(echo -n "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_TOKEN }}" | base64 -w 0)
-      CONFIG_B64=$(echo -n "{\"auths\":{\"$REGISTRY\":{\"auth\":\"$AUTH_B64\"}}}" | base64 -w 0)
+          # Prepare Kaniko destination arguments
+          FRONTEND_DESTS="--destination $IMAGE_REPO:frontend-$SHORT_SHA"
+          BACKEND_DESTS="--destination $IMAGE_REPO:backend-$SHORT_SHA"

-      echo "frontend_dests=$FRONTEND_DESTS" >> "$GITHUB_OUTPUT"
-      echo "backend_dests=$BACKEND_DESTS" >> "$GITHUB_OUTPUT"
-      echo "config_b64=$CONFIG_B64" >> "$GITHUB_OUTPUT"
+          if [[ "$GITHUB_REF_TYPE" == "tag" ]]; then
+            FRONTEND_DESTS="$FRONTEND_DESTS --destination $IMAGE_REPO:frontend-${GITHUB_REF_NAME}"
+            BACKEND_DESTS="$BACKEND_DESTS --destination $IMAGE_REPO:backend-${GITHUB_REF_NAME}"
+          fi

-  - name: Build and Push Frontend
-    uses: docker://gcr.io/kaniko-project/executor:debug
-    with:
-      entrypoint: /busybox/sh
-      args: >-
-        -c "mkdir -p /kaniko/.docker && 
-        echo ${{ steps.meta.outputs.config_b64 }} | base64 -d > /kaniko/.docker/config.json && 
-        /kaniko/executor --context=dir://${{ github.workspace }} --dockerfile=src/frontend/Containerfile ${{ steps.meta.outputs.frontend_dests }}"
+          if [[ "$GITHUB_REF_NAME" == "main" || "$GITHUB_REF_NAME" == "master" ]]; then
+            FRONTEND_DESTS="$FRONTEND_DESTS --destination $IMAGE_REPO:frontend-latest"
+            BACKEND_DESTS="$BACKEND_DESTS --destination $IMAGE_REPO:backend-latest"
+          fi

-  - name: Build and Push Backend
-    uses: docker://gcr.io/kaniko-project/executor:debug
-    with:
-      entrypoint: /busybox/sh
-      args: >-
-        -c "mkdir -p /kaniko/.docker && 
-        echo ${{ steps.meta.outputs.config_b64 }} | base64 -d > /kaniko/.docker/config.json && 
-        /kaniko/executor --context=dir://${{ github.workspace }} --dockerfile=src/backend/Containerfile ${{ steps.meta.outputs.backend_dests }}"
+          # Create the auth string
+          AUTH_B64=$(echo -n "${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_TOKEN }}" | base64 -w 0)
+          CONFIG_JSON="{\"auths\":{\"$REGISTRY\":{\"auth\":\"$AUTH_B64\"}}}"
+          CONFIG_B64=$(echo -n "$CONFIG_JSON" | base64 -w 0)
+
+          echo "frontend_dests=$FRONTEND_DESTS" >> "$GITHUB_OUTPUT"
+          echo "backend_dests=$BACKEND_DESTS" >> "$GITHUB_OUTPUT"
+          echo "config_b64=$CONFIG_B64" >> "$GITHUB_OUTPUT"
+
+      - name: Build and Push Frontend
+        uses: docker://gcr.io/kaniko-project/executor:debug
+        env:
+          DOCKER_CONFIG_B64: ${{ steps.meta.outputs.config_b64 }}
+        with:
+          entrypoint: /busybox/sh
+          args: >-
+            -c "mkdir -p /kaniko/.docker && 
+            echo $DOCKER_CONFIG_B64 | base64 -d > /kaniko/.docker/config.json && 
+            /kaniko/executor 
+            --context=$GITHUB_WORKSPACE 
+            --dockerfile=$GITHUB_WORKSPACE/src/frontend/Containerfile 
+            ${{ steps.meta.outputs.frontend_dests }}"
+
+      - name: Build and Push Backend
+        uses: docker://gcr.io/kaniko-project/executor:debug
+        env:
+          DOCKER_CONFIG_B64: ${{ steps.meta.outputs.config_b64 }}
+        with:
+          entrypoint: /busybox/sh
+          args: >-
+            -c "mkdir -p /kaniko/.docker && 
+            echo $DOCKER_CONFIG_B64 | base64 -d > /kaniko/.docker/config.json && 
+            /kaniko/executor 
+            --context=$GITHUB_WORKSPACE 
+            --dockerfile=$GITHUB_WORKSPACE/src/backend/Containerfile 
+            ${{ steps.meta.outputs.backend_dests }}"