From 5ad175f2fe1c36f0d5ebce2853788f28ad856b78 Mon Sep 17 00:00:00 2001 From: ai-dev Date: Fri, 1 Nov 2024 23:29:43 +0100 Subject: [PATCH] final update --- gitea_act_runner/Dockerfile | 1 - .../actrunner/dependencies.d/init-actrunner | 0 .../etc/s6-overlay/s6-rc.d/actrunner/run | 51 ++++++++++++++++-- .../init-actrunner/dependencies.d/base | 0 .../etc/s6-overlay/s6-rc.d/init-actrunner/run | 52 ------------------- .../s6-overlay/s6-rc.d/init-actrunner/type | 1 - .../etc/s6-overlay/s6-rc.d/init-actrunner/up | 1 - .../s6-rc.d/user/contents.d/init-actrunner | 0 8 files changed, 48 insertions(+), 58 deletions(-) delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/dependencies.d/init-actrunner delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/dependencies.d/base delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/type delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/up delete mode 100644 gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-actrunner diff --git a/gitea_act_runner/Dockerfile b/gitea_act_runner/Dockerfile index 0dcb77d..913260b 100644 --- a/gitea_act_runner/Dockerfile +++ b/gitea_act_runner/Dockerfile @@ -29,7 +29,6 @@ RUN python3 -m venv /opt/ansible-venv && \ /opt/ansible-venv/bin/pip install --no-cache-dir ansible RUN chmod +x /etc/s6-overlay/s6-rc.d/actrunner/* -RUN chmod +x /etc/s6-overlay/s6-rc.d/init-actrunner/* # Labels LABEL \ diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/dependencies.d/init-actrunner b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/dependencies.d/init-actrunner deleted file mode 100644 index e69de29..0000000 diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run index 03fa1b8..dfab1b6 100644 --- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run +++ b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/actrunner/run @@ -1,9 +1,54 @@ #!/command/with-contenv bashio # shellcheck shell=bash # ============================================================================== -# Home Assistant Community Add-on: actrunner -# Runs the actrunner daemon +# Home Assistant Community Add-on: Example +# Example init script, runs before any other service # ============================================================================== -bashio::log.info "Starting actrunner..." + +declare log_level + +bashio::log.info 'Starting actrunner...' + +journal_path='/var/log/journal' +if ! bashio::fs.directory_exists "${journal_path}" || [ -z "$(ls -A ${journal_path})" ]; then + bashio::log.info "No journal at ${journal_path}, looking for journal in /run/log/journal instead" + journal_path='/run/log/journal' +fi + +case "$(bashio::config 'log_level')" in \ + trace) ;& \ + debug) log_level='debug' ;; \ + notice) ;& \ + warning) log_level='warn' ;; \ + error) ;& \ + fatal) log_level='error' ;; \ + *) log_level='info' ;; \ +esac; +bashio::log.info "act_runner log level set to ${log_level}" + +export "JOURNAL_PATH=${journal_path}" +export "LOG_LEVEL=${log_level}" + +# Activate the Ansible virtual environment +source /opt/ansible-venv/bin/activate + +bashio::log.info "register act_runner !" + +# Load configuration from Home Assistant +GITEA_URL=$(bashio::config 'gitea_url') +GITEA_TOKEN=$(bashio::config 'gitea_token') +RUNNER_NAME=$(bashio::config 'runner_name') +RUNNER_LABEL=$(bashio::config 'runner_label') + +# Register the runner +/usr/local/bin/act_runner register --no-interactive --instance "${GITEA_URL}" --token "${GITEA_TOKEN}" --name "${RUNNER_NAME}" --labels "${RUNNER_LABEL}" + +# Check if registration was successful +if [ $? -ne 0 ]; then + bashio::log.error "Failed to register act_runner." + exit 1 +fi + +bashio::log.info "Registration complete. Starting act_runner in daemon mode..." exec /usr/local/bin/act_runner daemon \ No newline at end of file diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/dependencies.d/base b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/dependencies.d/base deleted file mode 100644 index e69de29..0000000 diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run deleted file mode 100644 index ae1e829..0000000 --- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/run +++ /dev/null @@ -1,52 +0,0 @@ -#!/command/with-contenv bashio -# shellcheck shell=bash -# ============================================================================== -# Home Assistant Community Add-on: Example -# Example init script, runs before any other service -# ============================================================================== - -declare log_level - -bashio::log.info 'Starting actrunner...' - -journal_path='/var/log/journal' -if ! bashio::fs.directory_exists "${journal_path}" || [ -z "$(ls -A ${journal_path})" ]; then - bashio::log.info "No journal at ${journal_path}, looking for journal in /run/log/journal instead" - journal_path='/run/log/journal' -fi - -case "$(bashio::config 'log_level')" in \ - trace) ;& \ - debug) log_level='debug' ;; \ - notice) ;& \ - warning) log_level='warn' ;; \ - error) ;& \ - fatal) log_level='error' ;; \ - *) log_level='info' ;; \ -esac; -bashio::log.info "act_runner log level set to ${log_level}" - -export "JOURNAL_PATH=${journal_path}" -export "LOG_LEVEL=${log_level}" - -# Activate the Ansible virtual environment -source /opt/ansible-venv/bin/activate - -bashio::log.info "register act_runner !" - -# Load configuration from Home Assistant -GITEA_URL=$(bashio::config 'gitea_url') -GITEA_TOKEN=$(bashio::config 'gitea_token') -RUNNER_NAME=$(bashio::config 'runner_name') -RUNNER_LABEL=$(bashio::config 'runner_label') - -# Register the runner -/usr/local/bin/act_runner register --no-interactive --instance "${GITEA_URL}" --token "${GITEA_TOKEN}" --name "${RUNNER_NAME}" --labels "${RUNNER_LABEL}" - -# Check if registration was successful -if [ $? -ne 0 ]; then - bashio::log.error "Failed to register act_runner." - exit 1 -fi - -bashio::log.info "Registration complete. Starting act_runner in daemon mode..." diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/type b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/type deleted file mode 100644 index bdd22a1..0000000 --- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/type +++ /dev/null @@ -1 +0,0 @@ -oneshot diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/up b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/up deleted file mode 100644 index 4d8fd65..0000000 --- a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/init-actrunner/up +++ /dev/null @@ -1 +0,0 @@ -/etc/s6-overlay/s6-rc.d/init-actrunner/run diff --git a/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-actrunner b/gitea_act_runner/rootfs/etc/s6-overlay/s6-rc.d/user/contents.d/init-actrunner deleted file mode 100644 index e69de29..0000000