From b4e6da4b2e4d8bcdb1aaff032743e2d9888c5f7e Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 19 Dec 2024 15:03:50 +0000 Subject: [PATCH 1/2] Make checks consistent between init and svc --- root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run index 44e472f..0f1fcf6 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-prowlarr/run @@ -1,14 +1,14 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -if [[ -n ${LSIO_NON_ROOT_USER} ]]; then +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then exec \ s6-notifyoncheck -d -n 300 -w 1000 \ - cd /app/prowlarr/bin /app/prowlarr/bin/Prowlarr \ + cd /app/prowlarr/bin s6-setuidgid abc /app/prowlarr/bin/Prowlarr \ -nobrowser -data=/config else exec \ s6-notifyoncheck -d -n 300 -w 1000 \ - cd /app/prowlarr/bin s6-setuidgid abc /app/prowlarr/bin/Prowlarr \ + cd /app/prowlarr/bin /app/prowlarr/bin/Prowlarr \ -nobrowser -data=/config fi From 5b9a311376c39d25b6d454a7bf1d57fe9d1484a2 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 19 Dec 2024 16:00:10 +0000 Subject: [PATCH 2/2] Increase CI timeout --- Jenkinsfile | 2 +- jenkins-vars.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index 2297cb9..6f53027 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { CI_WEB='true' CI_PORT='9696' CI_SSL='false' - CI_DELAY='120' + CI_DELAY='240' CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='/system/status' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index c8e11e3..ddd964c 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='9696' - CI_SSL='false' - - CI_DELAY='120' + - CI_DELAY='240' - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='/system/status'