🗃️ Committing everything that changed 🗃️

rootfs/usr/local/etc/docker/init.d/zz-act_runner.sh
This commit is contained in:
casjay 2024-08-11 18:33:04 -04:00
parent cde984a0e7
commit b5ffc23142
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145

View File

@ -229,20 +229,20 @@ EOF
# Settings for the default gitea runner # Settings for the default gitea runner
RUNNER_NAME="runner-1" RUNNER_NAME="runner-1"
RUNNER_HOME="$CONF_DIR/multi/\$RUNNER_NAME" 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_HOSTNAME="https://${HOSTNAME:-127.0.0.1:8000}"
RUNNER_REGISTER_URL="http://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 EOF
cat <<EOF >"$CONF_DIR/reg/runner-2.reg" cat <<EOF >"$CONF_DIR/reg/runner-2.reg"
# Settings for the default local runner # Settings for the default local runner
RUNNER_NAME="runner-2" RUNNER_NAME="runner-2"
RUNNER_HOME="$CONF_DIR/multi/\$RUNNER_NAME" 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_HOSTNAME="https://${HOSTNAME:-127.0.0.1:8000}"
RUNNER_REGISTER_URL="http://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 EOF
fi fi
@ -250,6 +250,10 @@ EOF
[ -f "$runner" ] && . "$runner" [ -f "$runner" ] && . "$runner"
RUNNER_NAME="${RUNNER_NAME:-$(basename "${runner//.reg/}")}" RUNNER_NAME="${RUNNER_NAME:-$(basename "${runner//.reg/}")}"
RUNNER_HOME="${RUNNER_HOME:-$CONF_DIR/multi/$RUNNER_NAME}" 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 while :; do
[ -n "$RUNNER_NAME" ] && [ -n "$RUNNER_HOME" ] || break [ -n "$RUNNER_NAME" ] && [ -n "$RUNNER_HOME" ] || break
[ -f "$RUN_DIR/act_runner.$RUNNER_NAME.pid" ] && break [ -f "$RUN_DIR/act_runner.$RUNNER_NAME.pid" ] && break