From 8101b9e817efaf8073a9cd2642dd92e2afce7cc1 Mon Sep 17 00:00:00 2001
From: Manuel Thalmann <m@nuth.ch>
Date: Tue, 26 Nov 2024 15:42:18 +0100
Subject: [PATCH] Configure forgejo runner by default
---
.../Software/docker/services/forgejo/docker-compose.secrets.yml | 1 +
scripts/Common/Software/docker/services/forgejo/main.fish | 2 ++
2 files changed, 3 insertions(+)
diff --git a/scripts/Common/Software/docker/services/forgejo/docker-compose.secrets.yml b/scripts/Common/Software/docker/services/forgejo/docker-compose.secrets.yml
index 47ff35a5..0cc10cb8 100644
--- a/scripts/Common/Software/docker/services/forgejo/docker-compose.secrets.yml
+++ b/scripts/Common/Software/docker/services/forgejo/docker-compose.secrets.yml
@@ -5,3 +5,4 @@ services:
- 127.0.0.1:1337:3000
- 127.0.0.1:1338:22
db: {}
+ runner: {}
diff --git a/scripts/Common/Software/docker/services/forgejo/main.fish b/scripts/Common/Software/docker/services/forgejo/main.fish
index 404a955a..c1f38271 100755
--- a/scripts/Common/Software/docker/services/forgejo/main.fish
+++ b/scripts/Common/Software/docker/services/forgejo/main.fish
@@ -24,6 +24,7 @@ begin
DOMAIN=(getServiceDomain $server) PW=$pw DB=Git USER=forgejo PW=$pw begin
set -l gitEnv "$(getServiceKey "$service").environment"
+ set -l actEnv "$(getServiceKey "runner").environment"
set -l dbEnv "$(getServiceKey "db").environment"
PORT=$port yq "$(getSSHPortKey) = env(PORT)" "$source" | \
@@ -34,6 +35,7 @@ begin
yq "$dbEnv.MARIADB_DATABASE = env(DB)" | \
yq "$dbEnv.MARIADB_USER = env(USER)" | \
yq "$dbEnv.MARIADB_PASSWORD = env(PW)" | \
+ URL="https://$DOMAIN/" yq "$actEnv.GITEA_INSTANCE_URL = env(URL)" | \
sudo tee "$secrets" >/dev/null
end