From 198f639289c08c33e7ca14950b72e57a47e51a66 Mon Sep 17 00:00:00 2001
From: tas <thomas.schick@mailbox.org>
Date: Sun, 15 Mar 2026 17:25:11 +0000
Subject: [PATCH] Update .gitea/workflows/deploy.yaml

---
 .gitea/workflows/deploy.yaml | 81 +++++++++++++++---------------------
 1 file changed, 34 insertions(+), 47 deletions(-)

diff --git a/.gitea/workflows/deploy.yaml b/.gitea/workflows/deploy.yaml
index dd3dacf..1738bbd 100644
--- a/.gitea/workflows/deploy.yaml
+++ b/.gitea/workflows/deploy.yaml
@@ -1,57 +1,44 @@
 name: Deploy
 
-on:
-  push:
-    branches: [main]
+  on:
+    push:
+      branches: [main]
 
-env:
-  REGISTRY: git.kimchi
-  IMAGE: git.kimchi/tas/major_tom
-  NAMESPACE: jnr-web
-  DEPLOYMENT: jnr-web
+  env:
+    REGISTRY: git.kimchi
+    IMAGE: git.kimchi/tas/major_tom
+    NAMESPACE: jnr-web
+    DEPLOYMENT: jnr-web
 
-jobs:
-  deploy:
-    runs-on: ubuntu-latest
-    steps:
+  jobs:
+    deploy:
+      runs-on: ubuntu-latest
+      steps:
+        - name: Checkout
+          run: |
+            git clone --depth 1 https://${{ secrets.REGISTRY_USER }}:${{ secrets.REGISTRY_PASSWORD }}@git.kimchi/tas/major_tom.git .
 
-      - name: Install buildah                                                                                                                              
-        run: |
-          apt-get update && apt-get install -y buildah
-          mkdir -p /etc/containers
-          printf '[[registry]]\nlocation = "git.kimchi"\ninsecure = true\n' > /etc/containers/registries.conf
+        - name: Build and push container image
+          run: |
+            IMAGE_TAG="${{ env.IMAGE }}:sha-${GITHUB_SHA::8}"
+            IMAGE_LATEST="${{ env.IMAGE }}:latest"
 
-      - name: Checkout
-        uses: actions/checkout@v4
+            buildah bud -f Containerfile -t "$IMAGE_TAG" -t "$IMAGE_LATEST" .
+            buildah login "${{ env.REGISTRY }}" -u "${{ secrets.REGISTRY_USER }}" -p "${{ secrets.REGISTRY_PASSWORD }}"
+            buildah push "$IMAGE_TAG"
+            buildah push "$IMAGE_LATEST"
 
-      # ── Build container image (includes WASM build stage) and push ──
-      - name: Configure insecure registry
-        run: |
-          mkdir -p /etc/containers
-          printf '[[registry]]\nlocation = "git.kimchi"\ninsecure = true\n' > /etc/containers/registries.conf
+            echo "IMAGE_TAG=$IMAGE_TAG" >> "$GITHUB_ENV"
 
-      - name: Build and push container image
-        run: |
-          IMAGE_TAG="${{ env.IMAGE }}:sha-${GITHUB_SHA::8}"
-          IMAGE_LATEST="${{ env.IMAGE }}:latest"
+        - name: Deploy to k3s
+          run: |
+            mkdir -p ~/.kube
+            echo "${{ secrets.KUBECONFIG }}" > ~/.kube/config
+            chmod 600 ~/.kube/config
 
-          buildah bud -f Containerfile -t "$IMAGE_TAG" -t "$IMAGE_LATEST" .
-          buildah login "${{ env.REGISTRY }}" -u "${{ secrets.REGISTRY_USER }}" -p "${{ secrets.REGISTRY_PASSWORD }}"
-          buildah push "$IMAGE_TAG"
-          buildah push "$IMAGE_LATEST"
+            kubectl set image deployment/${{ env.DEPLOYMENT }} \
+              ${{ env.DEPLOYMENT }}="${{ env.IMAGE_TAG }}" \
+              -n ${{ env.NAMESPACE }}
 
-          echo "IMAGE_TAG=$IMAGE_TAG" >> "$GITHUB_ENV"
-
-      # ── Deploy to k3s ──
-      - name: Deploy to k3s
-        run: |
-          mkdir -p ~/.kube
-          echo "${{ secrets.KUBECONFIG }}" > ~/.kube/config
-          chmod 600 ~/.kube/config
-
-          kubectl set image deployment/${{ env.DEPLOYMENT }} \
-            ${{ env.DEPLOYMENT }}="${{ env.IMAGE_TAG }}" \
-            -n ${{ env.NAMESPACE }}
-
-          kubectl rollout status deployment/${{ env.DEPLOYMENT }} \
-            -n ${{ env.NAMESPACE }} --timeout=60s
+            kubectl rollout status deployment/${{ env.DEPLOYMENT }} \
+              -n ${{ env.NAMESPACE }} --timeout=60s
\ No newline at end of file