.env.sample

@@ -13,4 +13,14 @@ RUNNER_CAPACITY=1
 RUNNER_TIMEOUT=3h
 
 # Set to 'host', to use the host network or any other. By using 'default', the runner gets configured to use the internal network of its own stack, so the action can access the docker socket proxy.
-#CONTAINER_NETWORK=default
+#CONTAINER_NETWORK="default"
+
+# Configuration for runner registration with the host. For more information see https://forgejo.org/docs/latest/admin/actions/registration/#interactive-registration
+RUNNER_TOKEN_VERSION=v1
+FORGEJO_HOST=https://instance1.org
+FORGEJO_RUNNER_UUID=12345678-1234-5678-1234-1234567890
+
+# Second host (optional)
+#RUNNER_TOKEN_2_VERSION=v1
+#FORGEJO_HOST_2=https://instance2.org
+#FORGEJO_RUNNER_UUID_2=12345678-1234-5678-1234-1234567890

compose.server2.yml

@@ -0,0 +1,11 @@
+version: '3.8'
+
+services:
+  app:
+    secrets:
+      - runner_token_2
+
+secrets:
+  runner_token_2:
+    external: true
+    name: ${STACK_NAME}_runner_token_2_${RUNNER_TOKEN_2_VERSION}

compose.yml

@@ -2,7 +2,7 @@ version: '3.8'
 
 services:
   app:
-    image: 'code.forgejo.org/forgejo/runner:12.7.1'
+    image: 'code.forgejo.org/forgejo/runner:12.9.0'
     environment:
       - DOCKER_HOST=tcp://socket-proxy:2375
     configs:
@@ -21,9 +21,11 @@ services:
     ports:
       - "44847:44847"
     entrypoint: /custom-entrypoint.sh
+    secrets:
+      - runner_token
 
   socket-proxy:
-    image: lscr.io/linuxserver/socket-proxy:3.2.13
+    image: lscr.io/linuxserver/socket-proxy:3.2.17
     environment:
       - PROXY_READ_TIMEOUT=5000
       - ALLOW_START=1
@@ -61,6 +63,11 @@ services:
 volumes:
   data:
 
+secrets:
+  runner_token:
+    external: true
+    name: ${STACK_NAME}_runner_token_${RUNNER_TOKEN_VERSION}
+
 networks:
   internal:
     attachable: true

config.yml.tmpl

@@ -80,3 +80,16 @@ host:
   # The parent directory of a job's working directory.
   # If it's empty, $HOME/.cache/act/ will be used.
   workdir_parent:
+
+server:
+  connections:
+    server-1:
+      url: "{{ env "FORGEJO_HOST" }}"
+      uuid: "{{ env "FORGEJO_RUNNER_UUID" }}"
+      token: "{{ secret "runner_token" }}"
+{{ if env "FORGEJO_HOST_2" }}
+    server-2:
+      url: "{{ env "FORGEJO_HOST_2" }}"
+      uuid: "{{ env "FORGEJO_RUNNER_UUID_2" }}"
+      token: "{{ secret "runner_token_2" }}"
+{{ end }}

entrypoint.sh.tmpl

@@ -5,11 +5,4 @@ set -e
 mkdir -p /data
 mkdir -p /data/.cache
 
-# Wait for the runner to get registered before starting the forgejo-runner daemon.
-while [ ! -s /data/.runner ]
-do
-  echo "The runner was not registered yet. Next try in 5 seconds."
-  sleep 5
-done
-
 forgejo-runner daemon --config /config.yml