From 58bfb589f13a2d12c60d2c657830d09ae706edc3 Mon Sep 17 00:00:00 2001
From: TuDatTr <tuan-dat.tran@tudattr.dev>
Date: Mon, 27 Nov 2023 23:25:18 +0100
Subject: [PATCH] Added additional info for gitea runner

Signed-off-by: TuDatTr <tuan-dat.tran@tudattr.dev>
---
 group_vars/all/vars.yml                    | 3 +++
 host_vars/aya01.yml                        | 1 +
 roles/docker/templates/aya01/compose.yaml  | 6 +++++-
 roles/docker/templates/naruto/compose.yaml | 6 ++++--
 4 files changed, 13 insertions(+), 3 deletions(-)

diff --git a/group_vars/all/vars.yml b/group_vars/all/vars.yml
index 01c5de9..525b246 100644
--- a/group_vars/all/vars.yml
+++ b/group_vars/all/vars.yml
@@ -526,8 +526,11 @@ gitea:
   runner:
     host: "gitea-runner-{{ host.hostname }}"
     token: "{{ host.gitea.runner.token }}"
+    name: "{{ host.hostname }}"
     volumes:
       data: "{{ docker_data_dir }}/gitea/runner/data/"
+      config: "{{ docker_dir }}/gitea/runner/config/"
+    config_file: "{{ docker_dir }}/gitea/runner/config/config.yml"
 
 #
 # Jellyseer
diff --git a/host_vars/aya01.yml b/host_vars/aya01.yml
index 18c28ea..34392b0 100644
--- a/host_vars/aya01.yml
+++ b/host_vars/aya01.yml
@@ -50,3 +50,4 @@ host:
   gitea:
     runner:
       token: "{{ vault.aya01.gitea.runner.token }}"
+      name: "aya01"
diff --git a/roles/docker/templates/aya01/compose.yaml b/roles/docker/templates/aya01/compose.yaml
index eb8cc51..0da700d 100644
--- a/roles/docker/templates/aya01/compose.yaml
+++ b/roles/docker/templates/aya01/compose.yaml
@@ -477,10 +477,14 @@ services:
     networks:
       - net
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
+      - "{{ gitea.runner.config_file }}:/config.yaml"
+      - "{{ gitea.runner.volumes.data }}:/data"
+      - "/var/run/docker.sock:/var/run/docker.sock"
     environment:
       - "GITEA_INSTANCE_URL={{ gitea.url }}"
       - "GITEA_RUNNER_REGISTRATION_TOKEN={{ gitea.runner.token }}"
+      - "GITEA_RUNNER_NAME: {{ gitea.runner.name }}"
+      - "CONFIG_FILE: /config.yaml"
 
   {{ jellyseer.host }}:
     container_name: {{ jellyseer.host }}
diff --git a/roles/docker/templates/naruto/compose.yaml b/roles/docker/templates/naruto/compose.yaml
index ee7745c..a71927c 100644
--- a/roles/docker/templates/naruto/compose.yaml
+++ b/roles/docker/templates/naruto/compose.yaml
@@ -24,11 +24,13 @@ services:
     networks:
       - net
     volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - {{ gitea.runner.volumes.data }}:/data
+      - "{{ gitea.runner.config_file }}:/config.yaml"
+      - "/var/run/docker.sock:/var/run/docker.sock"
     environment:
       - "GITEA_INSTANCE_URL={{ gitea.url }}"
       - "GITEA_RUNNER_REGISTRATION_TOKEN={{ gitea.runner.token }}"
+      - "GITEA_RUNNER_NAME: {{ gitea.runner.name }}"
+      - "CONFIG_FILE: /config.yaml"
 
 networks:
   net: