Split act-runner into its own pod.

act-runner/config/act-runner-config.yml

@@ -45,4 +45,4 @@ container:
   # Whether to use privileged mode or not when launching task containers (privileged mode is required for Docker-in-Docker).
   privileged: true
   # And other options to be used when the container is started (eg, --add-host=my.gitea.url:host-gateway).
-  options: --add-host=gitea.local:host-gateway --volume "/var/lib/docker"
+  options: --add-host=gitea.local:host-gateway --volume "/var/lib/docker" --volume "/data:/data:ro"

act-runner/docker-compose.yml

@@ -0,0 +1,23 @@
+
+services:
+  runner:
+    image: cerc/act-runner:local
+    restart: always
+    environment:
+      - CONFIG_FILE=/config/act-runner-config.yml
+      # Note: eMdEwIzSo87nBh0UFWZlbp308j6TNWr3WhWxQqIc is a static token we use for convenience in stand-alone deployments. Not secure, obviously.
+      - GITEA_RUNNER_REGISTRATION_TOKEN=${CERC_GITEA_RUNNER_REGISTRATION_TOKEN:-eMdEwIzSo87nBh0UFWZlbp308j6TNWr3WhWxQqIc}
+      - GITEA_INSTANCE_URL=${CERC_GITEA_INSTANCE_URL:-http://gitea.local:3000}
+      - GITEA_RUNNER_LABELS=${CERC_GITEA_RUNNER_LABELS:-ubuntu-latest:docker://cerc/act-runner-task-executor:local,ubuntu-22.04:docker://cerc/act-runner-task-executor:local}
+    extra_hosts:
+      - "gitea.local:host-gateway"
+    volumes:
+      - /var/run/docker.sock:/var/run/docker.sock
+      - act-runner-data:/data
+      - act-runner-config:/config:ro
+    ports:
+      - 8088
+
+volumes:
+  act-runner-data:
+  act-runner-config:

act-runner/post_start.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi

act-runner/pre_start.sh

@@ -0,0 +1,4 @@
+#!/usr/bin/env bash
+if [[ -n "$CERC_SCRIPT_DEBUG" ]]; then
+    set -x
+fi

act-runner/stack/deploy/commands.py

@@ -21,5 +21,6 @@ def create(context, extra_args):
     # Our goal here is just to copy the config file for act
     deployment_config_dir = context.deployment_dir.joinpath("data",
                                                             "act-runner-config")
-    source_config_file = Path(context.command_context.cluster_context.compose_files[0]).parent.joinpath("config", "act-runner-config.yml")
+    compose_file = [f for f in context.command_context.cluster_context.compose_files if "act-runner" in f][0]
+    source_config_file = Path(compose_file).parent.joinpath("config", "act-runner-config.yml")
     copy(source_config_file, deployment_config_dir)

gitea/README.md

@@ -29,4 +29,4 @@ Details on how to setup remote debugging of the gitea server inside its containe
 #### Action Runners
 
 A Dockerized action runner is deployed by default for the labels `ubuntu-latest` and `ubuntu-22.04`.  Details on deploying
-additional runners can be found [here](act-runner.md).
+additional runners can be found [here](../act-runner/act-runner.md).

gitea/docker-compose.yml

@@ -42,28 +42,6 @@ services:
     volumes:
       - postgres-data:/var/lib/postgresql/data
 
-  runner:
-    image: cerc/act-runner:local
-    restart: always
-    environment:
-      # Note: eMdEwIzSo87nBh0UFWZlbp308j6TNWr3WhWxQqIc is a static token we use for convenience in stand-alone deployments. Not secure, obviously.
-      - GITEA_RUNNER_REGISTRATION_TOKEN=${CERC_GITEA_RUNNER_REGISTRATION_TOKEN:-eMdEwIzSo87nBh0UFWZlbp308j6TNWr3WhWxQqIc}
-      - GITEA_INSTANCE_URL=http://gitea.local:3000
-      - GITEA_RUNNER_LABELS=ubuntu-latest:docker://cerc/act-runner-task-executor:local,ubuntu-22.04:docker://cerc/act-runner-task-executor:local
-      - CONFIG_FILE=/config/act-runner-config.yml
-    extra_hosts:
-      - "gitea.local:host-gateway"
-    volumes:
-      - /var/run/docker.sock:/var/run/docker.sock
-      - act-runner-data:/data
-      - act-runner-config:/config:ro
-    ports:
-      - 8088:8088
-
-
 volumes:
   gitea-data:
   postgres-data:
-  act-runner-data:
-  act-runner-config:
-