From 9f22a03c19d0a7f747a6913c8f14b48a30a66d0c Mon Sep 17 00:00:00 2001 From: casjay Date: Sun, 11 Aug 2024 17:15:42 -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 | 5 +---- 1 file changed, 1 insertion(+), 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 cdbcd4a..df48e93 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 @@ -247,7 +247,6 @@ CONTAINER_IP4_ADDRESS="${HOSTNAME}" EOF fi for runner in "$CONF_DIR/reg"/*.reg; do - exitStatus=0 unset RUNNER_HOME RUNNER_NAME RUNNER_NAME="$(basename "${runner//.reg/}")" RUNNER_HOME="${RUNNER_HOME:-$CONF_DIR/multi/$RUNNER_NAME}" @@ -275,15 +274,13 @@ EOF __replace "REPLACE_RUNNER_HOME" "$RUNNER_HOME" "$RUNNER_HOME/$RUNNER_NAME.yaml" act_runner register --config "$RUNNER_HOME/daemon.yaml" --labels "$RUNNER_LABELS" --name "$RUNNER_NAME" --instance "http://$CONTAINER_IP4_ADDRESS:8000" --token "$RUNNER_AUTH_TOKEN" --no-interactive && exitStatus=0 || exitStatus=1 if [ $exitStatus -eq 0 ]; then - exitStatus=0 cp -Rf "$runner" "$RUNNER_HOME/$RUNNER_NAME.reg" chown -Rf "$SERVICE_USER":"$SERVICE_GROUP" "$RUNNER_HOME" - echo "$!" >"$RUN_DIR/act_runner.$RUNNER_NAME.pid" echo "$RUNNER_NAME has been registered" break else [ -f "$RUN_DIR/act_runner.$RUNNER_NAME.pid" ] && rm -f "$RUN_DIR/act_runner.$RUNNER_NAME.pid" - exitStatus=1 + exitStatus=$((exitStatus++)) sleep 20 fi fi