From d3382c39d4b106f55cb03027ad97b9a608bd1986 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 19 Dec 2024 15:03:43 +0000 Subject: [PATCH 1/2] Make checks consistent between init and svc --- root/etc/s6-overlay/s6-rc.d/svc-lidarr/run | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run index 5aaf7b4..81b08eb 100755 --- a/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run +++ b/root/etc/s6-overlay/s6-rc.d/svc-lidarr/run @@ -1,14 +1,14 @@ #!/usr/bin/with-contenv bash # shellcheck shell=bash -if [[ -n ${LSIO_NON_ROOT_USER} ]]; then - exec \ - s6-notifyoncheck -d -n 300 -w 1000 \ - cd /app/lidarr/bin /app/lidarr/bin/Lidarr \ - -nobrowser -data=/config -else +if [[ -z ${LSIO_NON_ROOT_USER} ]]; then exec \ s6-notifyoncheck -d -n 300 -w 1000 \ cd /app/lidarr/bin s6-setuidgid abc /app/lidarr/bin/Lidarr \ -nobrowser -data=/config +else + exec \ + s6-notifyoncheck -d -n 300 -w 1000 \ + cd /app/lidarr/bin /app/lidarr/bin/Lidarr \ + -nobrowser -data=/config fi From 715dcbf8a109422357c6086caa99aa6563fd4ed6 Mon Sep 17 00:00:00 2001 From: thespad Date: Thu, 19 Dec 2024 15:59:35 +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 4ffdfef..3c980b6 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -32,7 +32,7 @@ pipeline { CI_WEB='true' CI_PORT='8686' CI_SSL='false' - CI_DELAY='60' + CI_DELAY='240' CI_DOCKERENV='' CI_AUTH='' CI_WEBPATH='/system/status' diff --git a/jenkins-vars.yml b/jenkins-vars.yml index 96be5a7..cb6c980 100644 --- a/jenkins-vars.yml +++ b/jenkins-vars.yml @@ -20,7 +20,7 @@ repo_vars: - CI_WEB='true' - CI_PORT='8686' - CI_SSL='false' - - CI_DELAY='60' + - CI_DELAY='240' - CI_DOCKERENV='' - CI_AUTH='' - CI_WEBPATH='/system/status'