From 61e1204536d800b6302b2b92fb40c726e5dff8ea Mon Sep 17 00:00:00 2001 From: Tianyu Liu Date: Wed, 21 May 2025 22:04:15 +0200 Subject: [PATCH] modify install --- gitea_runner/install.sh | 36 ++++++++++++++++++++---------------- 1 file changed, 20 insertions(+), 16 deletions(-) diff --git a/gitea_runner/install.sh b/gitea_runner/install.sh index 7730ba0..a9f8692 100755 --- a/gitea_runner/install.sh +++ b/gitea_runner/install.sh @@ -42,9 +42,16 @@ LABELS=("${DEFAULT_LABELS[@]}" "${ADDITIONAL_LABLES[@]}") LABLES_STRING=$(IFS=','; echo "${LABELS[*]}") + +$RUNNER generate-config > "$INSTALL_DIR/config.yaml" + +echo "act_runner config generated." +echo "act_runner config file created at $INSTALL_DIR/config.yaml" + pushd "$INSTALL_DIR" || exit 1 $RUNNER register \ --no-interactive \ + --config config.yaml \ --instance $GITEA_URL \ --token $GITEA_TOKEN \ --name $RUNNER_NAME \ @@ -52,20 +59,6 @@ $RUNNER register \ popd || exit 1 -# $RUNNER generate-config > "$INSTALL_DIR/config.yaml" - -# echo "act_runner config generated." -# echo "act_runner config file created at $INSTALL_DIR/config.yaml" - -# echo "manually add additional labels to the config file - $INSTALL_DIR/config.yaml" -# echo "add the following labels to the config file - $INSTALL_DIR/config.yaml" -# for label in "${ADDITIONAL_LABLES[@]}"; do -# echo " - $label" -# done - -# echo "manually add docker socket to the config file - $INSTALL_DIR/config.yaml" -# echo "add the following docker socket to the config file - $INSTALL_DIR/config.yaml" -# echo " - $CONTAINER_HOST" # Create systemd service file SERVICE_FILE="${SERVICE_NAME}.service" @@ -74,11 +67,22 @@ cp "$SERVICE_FILE.template" "$SERVICE_FILE" ESC_RUNNER=$(printf '%s' "$RUNNER" | sed 's:/:\\/:g') ESC_INSTALL_DIR=$(printf '%s' "$INSTALL_DIR" | sed 's:/:\\/:g') -sed -i "s|^ExecStart=.*$|ExecStart=${ESC_RUNNER} daemon|" "$SERVICE_FILE" +sed -i "s|^ExecStart=.*$|ExecStart=${ESC_RUNNER} daemon --config ${ESC_INSTALL_DIR}/config.yaml|" "$SERVICE_FILE" sed -i "s|^WorkingDirectory=.*$|WorkingDirectory=${ESC_INSTALL_DIR}|" "$SERVICE_FILE" mv "$SERVICE_FILE" "$USER_SYSTEMD/$SERVICE_FILE" systemctl --user daemon-reload systemctl --user enable --now "${SERVICE_NAME}.service" -echo "Gitea act_runner installed and systemd service created." \ No newline at end of file +echo "Gitea act_runner installed and systemd service created." +echo "manually add additional labels to the config file - $INSTALL_DIR/config.yaml" +echo "add the following labels to the config file - $INSTALL_DIR/config.yaml" +for label in "${ADDITIONAL_LABLES[@]}"; do + echo " - $label" +done + +echo "manually add docker socket to the config file - $INSTALL_DIR/config.yaml" +echo "add the following docker socket to the config file - $INSTALL_DIR/config.yaml" +echo " - $CONTAINER_HOST" + +echo "Then restart service." \ No newline at end of file