added the actual deploy steps

'docker compose down' removes caddy_cf and the default network, which
intermittently severs the SSH session's own network path before 'up'
restores it (remote command exited without exit status). Replace with
'pull && up -d --force-recreate --remove-orphans' so the stack is
reconciled in place without tearing the network out from under the
connection, while still picking up the new :latest image.

.gitea/workflows/build-docker-images.yml

@@ -0,0 +1,137 @@
+name: Build Hugo
+
+on:
+  push:
+    branches: [ "main" ]
+
+env:
+  REGISTRY: tea.ahmza.com
+  IMAGE_NAME: ${{ gitea.repository }}
+
+jobs:
+  build:
+    runs-on: ubuntu-latest
+
+    permissions:
+      contents: read
+      packages: write
+      attestations: write
+      id-token: write
+
+    steps:
+      - name: Checkout Repo
+        uses: actions/checkout@v4
+
+      - name: Login to Gitea Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ${{ env.REGISTRY }}
+          username: ${{ gitea.repository_owner }}
+          password: ${{ secrets.GITEATOKEN }}
+
+      # QEMU deliberately omitted.
+      #
+      # Hugo runs on BUILDPLATFORM in the Dockerfile, so the static site is
+      # built natively on the runner. The final amd64/arm64 stages only copy
+      # the resulting static files into the target-platform SWS image.
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3
+
+      - name: Build and push
+        uses: docker/build-push-action@v6
+        with:
+          context: .
+          platforms: linux/arm64, linux/amd64
+          push: true
+          build-args: |
+            BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
+          tags: |
+            ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:latest
+            ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }}
+          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache
+          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache,mode=max
+  deploy:
+    runs-on: ubuntu-latest
+    needs: build
+
+    steps:
+      - name: Pre-flight - verify VPN prerequisites
+        # NetBird brings up a WireGuard interface, which needs a TUN device and
+        # NET_ADMIN inside the job container. Without them, `netbird up` hangs
+        # ~50s and dies with a cryptic "DeadlineExceeded". Check up front so the
+        # failure is obvious and points at the fix (runner config.yaml).
+        run: |
+          echo "::group::NetBird prerequisites"
+          if [ -e /dev/net/tun ]; then
+            echo "OK: /dev/net/tun present"
+          else
+            echo "::error title=Missing TUN device::/dev/net/tun not found. Add --device=/dev/net/tun to the runner's config.yaml container.options."
+            exit 1
+          fi
+          if command -v capsh >/dev/null 2>&1; then
+            capsh --print | grep -q 'cap_net_admin' \
+              && echo "OK: NET_ADMIN present" \
+              || echo "::warning title=NET_ADMIN missing::netbird up will likely time out (DeadlineExceeded) configuring wt0. Add --cap-add=NET_ADMIN to the runner's config.yaml container.options."
+          else
+            echo "note: capsh unavailable, skipping NET_ADMIN check"
+          fi
+          echo "::endgroup::"
+
+      - name: Netbird Connect
+        id: netbird
+        timeout-minutes: 3
+        uses: Alemiz112/netbird-connect@v1
+        with:
+          setup-key: ${{ secrets.NETBIRD_SETUP_KEY }}
+          hostname: 'gitea-actions-blog'
+          management-url: ${{ secrets.NETBIRD_URL }}
+
+      - name: NetBird status
+        # Surface the actual peer/route state in the log and hard-assert that
+        # the management connection is up before attempting any deploys.
+        run: |
+          echo "::group::netbird status"
+          sudo netbird status --detail || true
+          echo "::endgroup::"
+          sudo netbird status | grep -q 'Management: Connected' \
+            && echo "NetBird management connected." \
+            || { echo "::error title=NetBird not connected::Management not connected after netbird up."; exit 1; }
+
+      - name: Deploy image to talos-prod
+        uses: actions-hub/kubectl@v1.36.2
+        env:
+          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+        with:
+          args: >-
+            -n blog-ahmza-com
+            set image deployment/blog
+            blog=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }}
+
+      - name: Wait for rollout
+        uses: actions-hub/kubectl@v1.36.2
+        env:
+          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+        with:
+          args: >-
+            -n blog-ahmza-com
+            rollout status deployment/blog
+            --timeout=5m
+
+      - name: Show deployed pods
+        uses: actions-hub/kubectl@v1.36.2
+        env:
+          KUBE_CONFIG: ${{ secrets.KUBE_CONFIG }}
+        with:
+          args: >-
+            -n blog-ahmza-com
+            get pods -o wide
+
+      - name: NetBird diagnostics & disconnect
+        # Runs even on failure: captures final state for debugging and tears the
+        # peer down so stale 'gitea-actions-blog' peers don't pile up.
+        if: always()
+        run: |
+          echo "::group::final netbird status"
+          sudo netbird status --detail || echo "netbird unavailable"
+          echo "::endgroup::"
+          sudo netbird down || true

.github/workflows/build-docker-images.yml

@@ -1,86 +0,0 @@
-name: Build Hugo
-
-on:
-  push:
-    branches: [ "main" ]
-
-env:
-  REGISTRY: tea.ahmza.com
-  IMAGE_NAME: ${{ gitea.repository }}
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-
-    permissions:
-      contents: read
-      packages: write
-      attestations: write
-      id-token: write
-
-    steps:
-      - name: Checkout Repo
-        uses: actions/checkout@v4
-
-      - name: Login to Gitea Container Registry
-        uses: docker/login-action@v3
-        with:
-          registry: ${{ env.REGISTRY }}
-          username: ${{ gitea.repository_owner }}
-          password: ${{ secrets.GITEATOKEN }}
-
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Build and push
-        uses: docker/build-push-action@v6
-        with:
-          context: .
-          platforms: linux/arm64, linux/amd64
-          push: true
-          build-args: |
-            BUILDKIT_CONTEXT_KEEP_GIT_DIR=true
-          tags: |
-            ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:latest
-            ${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:${{ gitea.event.head_commit.id }}
-          # Registry-backed build cache. The GitHub-hosted 'gha' cache is not
-          # reachable from self-hosted Gitea runners, so store the cache as a
-          # dedicated tag in the same registry instead.
-          cache-from: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache
-          cache-to: type=registry,ref=${{ env.REGISTRY }}/${{ gitea.repository_owner }}/blog-ahmza-com:buildcache,mode=max
-  deploy:
-    runs-on: ubuntu-latest
-    needs: build
-
-    steps:
-      - name: Netbird Connect
-        uses: Alemiz112/netbird-connect@v1
-        with:
-          setup-key: ${{ secrets.NETBIRD_SETUP_KEY }}
-          hostname: 'gitea-actions-blog'
-          management-url: ${{ secrets.NETBIRD_URL }}
-
-      - name: Deploy to RPIC-Cluster
-        # RPIC cluster is temporarily out of service. Don't let its failure
-        # block the Gimli deploy or fail the whole job. Remove this line once
-        # the cluster is back.
-        continue-on-error: true
-        uses: appleboy/ssh-action@v1
-        with:
-          host: ${{ secrets.RPIC_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.RPIC_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: 'kubectl rollout restart deployment blog -n blog-ahmza-com'
-
-      - name: Deploy to Gimli
-        uses: appleboy/ssh-action@v1
-        with:
-          host: ${{ secrets.GIMLI_HOST }}
-          username: ${{ secrets.SSH_USER }}
-          key: ${{ secrets.GIMLI_KEY }}
-          port: ${{ secrets.SSH_PORT }}
-          script: 'docker compose down && docker compose pull && docker compose up -d'

Dockerfile

@@ -1,6 +1,21 @@
-FROM ghcr.io/hugomods/hugo:0.157.0 AS build
+# syntax=docker/dockerfile:1
+# Pin the build stage to the native build platform so Hugo runs once (never
+# under QEMU emulation). Hugo output is static HTML — identical across arches —
+# so there's no reason to run it per target arch. The runtime stage below stays
+# on TARGETPLATFORM, so multi-arch (amd64 + arm64) runtime images are preserved.
+FROM --platform=$BUILDPLATFORM ghcr.io/hugomods/hugo:0.157.0 AS build
 WORKDIR /tmp/hugo
-COPY . .
+
+COPY go.mod ./
+RUN hugo mod get
+
+COPY archetypes ./archetypes
+COPY assets ./assets
+COPY content ./content
+COPY static ./static
+COPY themes ./themes
+COPY hugo.* ./
+
 RUN hugo --gc --minify
 
 FROM ghcr.io/static-web-server/static-web-server:2

README.md

@@ -50,5 +50,5 @@ sacrificing performance.
 The Blowfish theme is managed as a Hugo module, so no submodules are required.
 Clone the repository with:
 ```bash
-git clone ssh://gitea@tea.ahmza.com:2222/ahmza/blog-ahmza-com.git
+git clone ssh://git@tea.ahmza.com/ahmza/blog-ahmza-com.git
 ```

layouts/partials/extend-footer.html

@@ -1,6 +1,8 @@
 <br>
 <div class="flex items-center gap-x-5">
 	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://mastodon.social/@ahmza">Mastodon</a>
-	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://github.com/ahmzaa">Github</a>
 	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://www.linkedin.com/in/ahmza/">Linkedin</a>
+	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://github.com/ahmzaa">Github</a>
+	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://gitlab.com/ahmza">Gitlab</a>
+	<a class="text-sm text-neutral-500 dark:text-neutral-400" rel="me noopener noreferrer" target="_blank" href="https://tea.ahmza.com/ahmza">Gitea</a>
 </div>