From 9441c0d37ed33b73b0c3163d2defd47aba2d7b46 Mon Sep 17 00:00:00 2001
From: fchinembiri <fchinembiri24@gmail.com>
Date: Fri, 8 May 2026 16:35:51 +0200
Subject: [PATCH] fix: use DooD (Docker-out-of-Docker) and external URLs for CI

---
 .gitea/workflows/build-push.yaml  | 4 ++--
 apps/api/trigger_ci.txt           | 2 +-
 k8s/base/gitea-runner-config.yaml | 9 ++-------
 k8s/base/gitea-runner.yaml        | 7 +++++++
 4 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/.gitea/workflows/build-push.yaml b/.gitea/workflows/build-push.yaml
index 60fbe9f..ae83703 100644
--- a/.gitea/workflows/build-push.yaml
+++ b/.gitea/workflows/build-push.yaml
@@ -63,8 +63,8 @@ jobs:
         run: |
           git config --global user.name "Gitea Action"
           git config --global user.email "action@gitea.com"
-          # Ensure we push to the correct Gitea instance
-          git remote set-url origin http://x-access-token:${{ secrets.GITEA_TOKEN }}@gitea.geocrop.svc.cluster.local:3000/fchinembiri/geocrop-platform.git
+          # Use external URL for reliability
+          git remote set-url origin https://x-access-token:${{ secrets.GITEA_TOKEN }}@git.techarvest.co.zw/fchinembiri/geocrop-platform..git
           git add k8s/base/kustomization.yaml
           git commit -m "ci: update image tags to ${{ github.sha }} [skip ci]" || echo "No changes to commit"
           git push origin main
diff --git a/apps/api/trigger_ci.txt b/apps/api/trigger_ci.txt
index 51e8fb9..80a0bd9 100644
--- a/apps/api/trigger_ci.txt
+++ b/apps/api/trigger_ci.txt
@@ -1 +1 @@
-trigger ci v5
+trigger ci v6
diff --git a/k8s/base/gitea-runner-config.yaml b/k8s/base/gitea-runner-config.yaml
index 6a98299..99c9dca 100644
--- a/k8s/base/gitea-runner-config.yaml
+++ b/k8s/base/gitea-runner-config.yaml
@@ -24,13 +24,8 @@ data:
       host: ""
       port: 0
     container:
-      type: kubernetes
-      kubernetes:
-        namespace: geocrop
-        service_account_name: gitea-runner-sa
-        privileged: false
-        pull_policy: IfNotPresent
+      type: docker
+      options: "--network host"
       force_pull: true
-
     valid_volumes:
       - "/certs/client"
diff --git a/k8s/base/gitea-runner.yaml b/k8s/base/gitea-runner.yaml
index 276e0e0..db6c284 100644
--- a/k8s/base/gitea-runner.yaml
+++ b/k8s/base/gitea-runner.yaml
@@ -38,9 +38,16 @@ spec:
         - name: config
           mountPath: /config.yaml
           subPath: config.yaml
+        - name: docker-sock
+          mountPath: /var/run/docker.sock
+          readOnly: true
       volumes:
       - name: runner-data
         emptyDir: {}
       - name: config
         configMap:
           name: gitea-runner-config
+      - name: docker-sock
+        hostPath:
+          path: /var/run/docker.sock
+          type: Socket