From 12f087fa033edba9ee97408adb8f551d75f90b81 Mon Sep 17 00:00:00 2001
From: Haletran <bpasquier123@gmail.com>
Date: Mon, 13 Apr 2026 23:07:13 +0200
Subject: [PATCH] fix: runners working and workflow rename folder

---
 .forgejo/worfkows/lxc-creator.yml | 33 -----------------
 forgejo/.env-example              |  1 +
 forgejo/compose.yml               | 61 +++++++++++++++++++------------
 3 files changed, 39 insertions(+), 56 deletions(-)
 delete mode 100644 .forgejo/worfkows/lxc-creator.yml

diff --git a/.forgejo/worfkows/lxc-creator.yml b/.forgejo/worfkows/lxc-creator.yml
deleted file mode 100644
index 399b8ee..0000000
--- a/.forgejo/worfkows/lxc-creator.yml
+++ /dev/null
@@ -1,33 +0,0 @@
-name: Lxc Creation
-
-on:
-  workflow_dispatch:
-
-jobs:
-  terraform:
-    runs-on: self-hosted
-    steps:
-      - name: Checkout code
-        uses: actions/checkout@v4
-
-      - name: Setup Terraform
-        uses: hashicorp/setup-terraform@v3
-        with:
-          terraform_version: "1.9.0"
-
-      - name: Terraform Init
-        run: terraform init
-        working-directory: ./terrafrom
-
-      - name: Terraform Plan
-        run: terraform plan
-        working-directory: ./terrafrom
-        env:
-          TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }}
-
-      - name: Terraform Apply
-        if: github.ref == 'refs/heads/main'
-        run: terraform apply -auto-approve
-        working-directory: ./terrafrom
-        env:
-          TF_VAR_pm_api_token_secret: ${{ secrets.PM_API_TOKEN_SECRET }}
diff --git a/forgejo/.env-example b/forgejo/.env-example
index 7ab85c3..bd09fa4 100644
--- a/forgejo/.env-example
+++ b/forgejo/.env-example
@@ -2,3 +2,4 @@ DB_PASSWORD=
 RUNNER_TOKEN=
 SSH_DOMAIN=
 SSH_PORT=
+ROOT_URL=
diff --git a/forgejo/compose.yml b/forgejo/compose.yml
index f5c497c..824cf8d 100644
--- a/forgejo/compose.yml
+++ b/forgejo/compose.yml
@@ -20,6 +20,8 @@ services:
       - FORGEJO__server__SSH_DOMAIN=${SSH_DOMAIN}
       - FORGEJO__openid__ENABLE_OPENID_SIGNIN=false
       - FORGEJO__openid__ENABLE_OPENID_SIGNUP=false
+      - FORGEJO__server__ROOT_URL=${ROOT_URL}
+      - FORGEJO__actions__ENABLED=true
     volumes:
       - forgejo-data:/data
       - /etc/timezone:/etc/timezone:ro
@@ -27,6 +29,8 @@ services:
     ports:
       - "3000:3000"
       - "222:22"
+    labels:
+      - "com.centurylinklabs.watchtower.enable=true"
     depends_on:
       - db
       - redis
@@ -34,36 +38,34 @@ services:
       - forgejo-network
     restart: unless-stopped
 
-  # runner:
-  #     image: code.forgejo.org/forgejo/runner:3.3.0
-  #     container_name: forgejo-runner
-  #     environment:
-  #         - DOCKER_HOST=tcp://docker-in-docker:2376
-  #         - DOCKER_TLS_VERIFY=1
-  #         - DOCKER_CERT_PATH=/certs/client
-  #     volumes:
-  #         - runner-data:/data
-  #         - docker-certs:/certs/client:ro
-  #     depends_on:
-  #         - forgejo
-  #         - docker-in-docker
-  #     networks:
-  #         - forgejo-network
-  #     restart: unless-stopped
-  #     command: >
-  #         sh -c "
-  #           while ! nc -z forgejo 3000; do sleep 1; done;
-  #           forgejo-runner daemon
-  #         "
+  runner:
+    image: code.forgejo.org/forgejo/runner:3.3.0
+    container_name: forgejo-runner
+    environment:
+      - DOCKER_HOST=tcp://docker-in-docker:2375
+      - DOCKER_TLS_VERIFY=0
+      - DOCKER_CERT_PATH=
+    volumes:
+      - runner-data:/data
+    depends_on:
+      - forgejo
+      - docker-in-docker
+    networks:
+      - forgejo-network
+    restart: unless-stopped
+    command: >
+      sh -c "
+        while ! nc -z forgejo 3000; do sleep 1; done;
+        forgejo-runner daemon
+      "
 
   docker-in-docker:
     image: docker:dind
     container_name: forgejo-dind
     privileged: true
     environment:
-      - DOCKER_TLS_CERTDIR=/certs
+      - DOCKER_TLS_CERTDIR=
     volumes:
-      - docker-certs:/certs
       - dind-data:/var/lib/docker
     networks:
       - forgejo-network
@@ -91,6 +93,19 @@ services:
       - forgejo-network
     restart: unless-stopped
 
+  watchtower:
+    image: containrrr/watchtower
+    container_name: forgejo-watchtower
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+    environment:
+      - WATCHTOWER_CLEANUP=true
+      - WATCHTOWER_INCLUDE_STOPPED=false
+      - WATCHTOWER_POLL_INTERVAL=86400
+      - WATCHTOWER_LABEL_ENABLE=true
+      - DOCKER_API_VERSION=1.40
+    restart: unless-stopped
+
 volumes:
   forgejo-data:
   runner-data: