From 16dc2821058cf10820939451f29651d58c72fc69 Mon Sep 17 00:00:00 2001
From: Tobias Manske <tobias.manske@mailbox.org>
Date: Tue, 28 Feb 2023 20:08:06 +0100
Subject: [PATCH] Split off gitea-runner

---
 coreos-config/playbook.yaml                   |  1 +
 .../templates/gitea-runner/.env               |  1 +
 .../gitea-runner/docker-compose.yaml          | 41 +++++++++++++++++++
 .../templates/gitea/docker-compose.yaml       | 18 --------
 4 files changed, 43 insertions(+), 18 deletions(-)
 create mode 100644 coreos-config/roles/compose_project/templates/gitea-runner/.env
 create mode 100644 coreos-config/roles/compose_project/templates/gitea-runner/docker-compose.yaml

diff --git a/coreos-config/playbook.yaml b/coreos-config/playbook.yaml
index 4653bc3..9e4330c 100644
--- a/coreos-config/playbook.yaml
+++ b/coreos-config/playbook.yaml
@@ -106,6 +106,7 @@
     - { role: compose_project, service: minio }
     - { role: compose_project, service: registry }
     - { role: compose_project, service: gitea }
+    - { role: compose_project, service: gitea-runner }
     - { role: compose_project, service: ba-gitlab-runner }
     - { role: compose_project, service: wireguard }
     - { role: compose_project, service: hedgedoc }
diff --git a/coreos-config/roles/compose_project/templates/gitea-runner/.env b/coreos-config/roles/compose_project/templates/gitea-runner/.env
new file mode 100644
index 0000000..6f14528
--- /dev/null
+++ b/coreos-config/roles/compose_project/templates/gitea-runner/.env
@@ -0,0 +1 @@
+COMPOSE_PROJECT_NAME=gitea-runner
diff --git a/coreos-config/roles/compose_project/templates/gitea-runner/docker-compose.yaml b/coreos-config/roles/compose_project/templates/gitea-runner/docker-compose.yaml
new file mode 100644
index 0000000..c39cae3
--- /dev/null
+++ b/coreos-config/roles/compose_project/templates/gitea-runner/docker-compose.yaml
@@ -0,0 +1,41 @@
+---
+version: '3.9'
+
+services:
+  dind:
+    image: docker:dind
+    restart: unless-stopped
+    privileged: true
+    volumes:
+      - /lib/modules:/lib/modules:ro
+    environment:
+      DOCKER_TLS_CERTDIR: ""
+    networks:
+      - backend
+      - default
+
+  drone_runner:
+    image: drone/drone-runner-docker:1.8
+    restart: always
+    environment:
+      - "DOCKER_HOST=tcp://dind:2375"
+      - "DRONE_RPC_SECRET={{ gitea.drone.rpc_secret }}"
+      - "DRONE_RPC_HOST=drone.tobiasmanske.de"
+      - "DRONE_RPC_PROTO=https"
+      - "DRONE_RUNNER_CAPACITY={{ gitea.drone.runner_capacity }}"
+      - "DRONE_RUNNER_NAME={{ gitea.drone.runner_name }}"
+{% if gitea.drone.runner_labels is defined %}
+      - "DRONE_RUNNER_LABELS={{ gitea.drone.runner_labels | join(',') }}"
+{% endif %}
+      - "DRONE_RUNNER_CLONE_IMAGE=drone/git:linux-amd64"
+      - "DRONE_RUNNER_VOLUMES=/etc/hosts:/etc/hosts"
+    depends_on:
+      - dind
+    networks:
+      - backend
+      - default
+
+networks:
+  backend:
+    internal: true
+...
diff --git a/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml b/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
index 0e547d4..3df99a3 100644
--- a/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
+++ b/coreos-config/roles/compose_project/templates/gitea/docker-compose.yaml
@@ -79,24 +79,6 @@ services:
     depends_on:
       - gitea
 
-  drone_runner:
-    image: drone/drone-runner-docker:1.8
-    restart: always
-    privileged: true
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-    environment:
-      - "DRONE_RPC_SECRET={{ gitea.drone.rpc_secret }}"
-      - "DRONE_RPC_HOST=drone.tobiasmanske.de"
-      - "DRONE_RPC_PROTO=https"
-      - "DRONE_RUNNER_CAPACITY=2"
-      - "DRONE_RUNNER_NAME=docker-01"
-      - "DRONE_RUNNER_CLONE_IMAGE=drone/git:linux-amd64"
-      - "DRONE_RUNNER_VOLUMES=/etc/hosts:/etc/hosts"
-    networks:
-      - backend
-      - default
-
 networks:
   backend:
     internal: true