From ff57f88c5b86255844e043b16e56ab7bc4a2959d Mon Sep 17 00:00:00 2001
From: Marko Korhonen <marko@korhonen.cc>
Date: Sat, 24 Feb 2024 14:29:55 +0200
Subject: [PATCH] Migrate from woodpecker to Forgejo Actions

---
 docker/forgejo/docker-compose.toml    | 16 ++++++++++++-
 docker/woodpecker/docker-compose.toml | 33 ---------------------------
 2 files changed, 15 insertions(+), 34 deletions(-)
 delete mode 100644 docker/woodpecker/docker-compose.toml

diff --git a/docker/forgejo/docker-compose.toml b/docker/forgejo/docker-compose.toml
index 602fc2e..6fa6634 100644
--- a/docker/forgejo/docker-compose.toml
+++ b/docker/forgejo/docker-compose.toml
@@ -1,15 +1,29 @@
 [volumes]
 data = {}
+runner = {}
 
 [services.forgejo]
 image = "git.korhonen.cc/functionalhacker/forgejo-asciidoc"
 container_name = "forgejo"
-environment = ["TZ=Europe/Helsinki"]
+environment = ["TZ=Europe/Helsinki", "USER_UID=1000", "USER_GID=1000"]
 restart = "unless-stopped"
 networks = ["postgres", "proxy"]
 ports = ["22:22"]
 volumes = ["data:/data", "/etc/localtime:/etc/localtime:ro"]
 
+[services.runner]
+image = "code.forgejo.org/forgejo/runner:3.3.0"
+container_name = "forgejo-runner"
+user = "root:root"
+volumes = [
+  "runner:/data",
+  "/var/run/docker.sock:/var/run/docker.sock",
+  "/etc/localtime:/etc/localtime:ro",
+]
+environment = ["SOCKFILE=/var/run/docker.sock"]
+restart = "unless-stopped"
+command = "forgejo-runner daemon -c /data/config.yaml"
+
 [networks.postgres]
 external = true
 
diff --git a/docker/woodpecker/docker-compose.toml b/docker/woodpecker/docker-compose.toml
deleted file mode 100644
index e98eb4b..0000000
--- a/docker/woodpecker/docker-compose.toml
+++ /dev/null
@@ -1,33 +0,0 @@
-[volumes]
-data = {}
-
-[services.woodpecker]
-image = "woodpeckerci/woodpecker-server"
-container_name = "woodpecker"
-restart = "unless-stopped"
-volumes = ["data:/var/lib/woodpecker"]
-env_file = [".env"]
-environment = [
-  "WOODPECKER_OPEN=true",
-  "WOODPECKER_GITEA=true",
-  "WOODPECKER_GITEA_URL=https://git.korhonen.cc",
-  "WOODPECKER_GITEA_CLIENT",
-  "WOODPECKER_GITEA_SECRET",
-  "WOODPECKER_AGENT_SECRET",
-  "WOODPECKER_HOST=https://ci.korhonen.cc",
-  "WOODPECKER_ADMIN=FunctionalHacker",
-]
-networks = ["proxy", "default"]
-
-[services.woodpecker-agent]
-image = "woodpeckerci/woodpecker-agent"
-container_name = "woodpecker-agent"
-command = "agent"
-restart = "unless-stopped"
-depends_on = ["woodpecker"]
-volumes = ["/var/run/docker.sock:/var/run/docker.sock"]
-env_file = [".env"]
-environment = ["WOODPECKER_SERVER=woodpecker:9000", "WOODPECKER_AGENT_SECRET"]
-
-[networks.proxy]
-external = true