From 1e466136c99c9baacaf07a22a843e89a99193b79 Mon Sep 17 00:00:00 2001
From: Merith-TK <merith@merith.xyz>
Date: Thu, 26 Dec 2024 00:01:20 +0000
Subject: [PATCH] update tests

---
 entrypoint.sh                                 |  4 ++--
 .../compose-forgejo-and-runner.yml            | 20 +++++++++----------
 2 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/entrypoint.sh b/entrypoint.sh
index 8e9d5fe..492ce47 100755
--- a/entrypoint.sh
+++ b/entrypoint.sh
@@ -81,14 +81,14 @@ if [[ ! -s "${RUNNER__RUNNER__FILE}" ]]; then
     if [[ -n "${FORGEJO_SECRET}" ]]; then
       run_command forgejo-runner create-runner-file --connect \
         --instance "${FORGEJO_URL:-http://forgejo:3000}" \
-        --name "${RUNNER_NAME:-$(hostname)}" \
+        --name "${RUNNER__NAME:-$(hostname)}" \
         --secret "${FORGEJO_SECRET}" \
         ${CONFIG_ARG} \
         ${EXTRA_ARGS} 2>&1 | tee /tmp/reg.log
     else
       run_command forgejo-runner register \
         --instance "${FORGEJO_URL:-http://forgejo:3000}" \
-        --name "${RUNNER_NAME:-$(hostname)}" \
+        --name "${RUNNER__NAME:-$(hostname)}" \
         --token "${RUNNER_TOKEN}" \
         --no-interactive \
         ${CONFIG_ARG} \
diff --git a/examples/docker-compose/compose-forgejo-and-runner.yml b/examples/docker-compose/compose-forgejo-and-runner.yml
index 018d956..21347cc 100644
--- a/examples/docker-compose/compose-forgejo-and-runner.yml
+++ b/examples/docker-compose/compose-forgejo-and-runner.yml
@@ -74,19 +74,19 @@ services:
       - forgejo
       - docker-in-docker
     environment:
-      CONFIG_FILE: config.yml # defaults to /data/config.yml
-
-      DOCKER_HOST: "tcp://docker:2376" # defaults to tcp://docker:2376
-      DOCKER_CERT_PATH: "/certs/client" # defaults to /certs/client
-      DOCKER_TLS_VERIFY: "1" # defaults to 1
-      DOCKER_PRIVILEGED: "true" # defaults to false for security reasons
-
       FORGEJO_URL: ${FORGEJO_URL} # defaults to http://forgejo:3000
       FORGEJO_SECRET: "{SHARED_SECRET}" # shared secret, must match Forgejo's, overrides RUNNER_TOKEN
-
-      RUNNER_FILE: .runner # defaults to /data/runner.json
-      RUNNER_NAME: runner-daemon # defaults to forgejo-runner, used for registration
       RUNNER_TOKEN: ${RUNNER_TOKEN} # token obtained from Forgejo web interface
 
+      RUNNER__CONFIG_FILE: config.yml # defaults to /data/config.yml
+      RUNNER__NAME: forgejo-runner # defaults to forgejo-runner
+      RUNNER__RUNNER__FILE: .runner # defaults to /data/runner.json
+      
+      RUNNER__CONTAINER__PRIVILEGED: "true" # defaults to false for security reasons
+      RUNNER__RUNNER__ENVS: |
+        DOCKER_HOST=tcp://docker:2376
+        DOCKER_TLS_VERIFY=1
+        DOCKER_CERT_PATH=/certs/client # defaults to empty
+      
       DEBUG: "true" # defaults to false, set to true to enable debug logging
       SKIP_WAIT: "false" # defaults to false, set to true to skip the 10 second wait to allow for forgejo and docker-in-docker to start