Merge pull request #308 from linuxserver/develop-nonroot-consistency

Author: thespad

Jenkinsfile

@@ -32,7 +32,7 @@ pipeline {
     CI_WEB='true'
     CI_PORT='8989'
     CI_SSL='false'
-    CI_DELAY='120'
+    CI_DELAY='240'
     CI_DOCKERENV=''
     CI_AUTH=''
     CI_WEBPATH='/system/status'

jenkins-vars.yml

@@ -21,7 +21,7 @@ repo_vars:
   - CI_WEB='true'
   - CI_PORT='8989'
   - CI_SSL='false'
-  - CI_DELAY='120'
+  - CI_DELAY='240'
   - CI_DOCKERENV=''
   - CI_AUTH=''
   - CI_WEBPATH='/system/status'

root/etc/s6-overlay/s6-rc.d/svc-sonarr/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/sonarr/bin /app/sonarr/bin/Sonarr \
+            cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
             -nobrowser -data=/config
 else
     exec \
         s6-notifyoncheck -d -n 300 -w 1000 \
-            cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
+            cd /app/sonarr/bin /app/sonarr/bin/Sonarr \
             -nobrowser -data=/config
 fi