From b5ffc231429ce9c010603a86dd815bd6503ed397 Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 18:33:04 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh --- rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh index de75015..75b245d 100755 --- a/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh +++ b/rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh @@ -229,20 +229,20 @@ EOF # Settings for the default gitea runner RUNNER_NAME="runner-1" RUNNER_HOME="$CONF_DIR/multi/\$RUNNER_NAME" -RUNNER_LABELS="$RUNNER_LABELS" -RUNNER_AUTH_TOKEN="${RUNNER_AUTH_TOKEN:-$SYS_AUTH_TOKEN}" RUNNER_HOSTNAME="https://${HOSTNAME:-127.0.0.1:8000}" RUNNER_REGISTER_URL="http://127.0.0.1:8000" +RUNNER_AUTH_TOKEN="${RUNNER_AUTH_TOKEN:-$SYS_AUTH_TOKEN}" +RUNNER_LABELS="$RUNNER_LABELS" EOF cat <"$CONF_DIR/reg/runner-2.reg" # Settings for the default local runner RUNNER_NAME="runner-2" RUNNER_HOME="$CONF_DIR/multi/\$RUNNER_NAME" -RUNNER_LABELS="$RUNNER_LABELS" -RUNNER_AUTH_TOKEN="${RUNNER_AUTH_TOKEN:-$SYS_AUTH_TOKEN}" RUNNER_HOSTNAME="https://${HOSTNAME:-127.0.0.1:8000}" RUNNER_REGISTER_URL="http://127.0.0.1:8000" +RUNNER_AUTH_TOKEN="${RUNNER_AUTH_TOKEN:-$SYS_AUTH_TOKEN}" +RUNNER_LABELS="$RUNNER_LABELS" EOF fi @@ -250,6 +250,10 @@ EOF [ -f "$runner" ] && . "$runner" RUNNER_NAME="${RUNNER_NAME:-$(basename "${runner//.reg/}")}" RUNNER_HOME="${RUNNER_HOME:-$CONF_DIR/multi/$RUNNER_NAME}" + RUNNER_HOSTNAME="https://${RUNNER_HOSTNAME:-$HOSTNAME}" + RUNNER_REGISTER_URL="${RUNNER_REGISTER_URL:-http://127.0.0.1:8000}" + RUNNER_AUTH_TOKEN="${RUNNER_AUTH_TOKEN:-$SYS_AUTH_TOKEN}" + RUNNER_LABELS="${RUNNER_LABELS:-act_runner}" while :; do [ -n "$RUNNER_NAME" ] && [ -n "$RUNNER_HOME" ] || break [ -f "$RUN_DIR/act_runner.$RUNNER_NAME.pid" ] && break