Merge pull request #77 from linuxserver-labs/3.22

Author: Roxedus

.github/workflows/build-base-image.yml

@@ -1,6 +1,8 @@
 name: Build baseimage
 
 on:
+  schedule:
+    - cron:  "54 6 1,15 * *"
   push:
     paths:
       - "Dockerfile.base"
@@ -43,7 +45,7 @@ jobs:
           echo "**** Setting build date to $BUILD_DATE ****"
           echo "build_date=${BUILD_DATE}" >> $GITHUB_OUTPUT
       - name: Build and push
-        uses: docker/bake-action@v6.7.0
+        uses: docker/bake-action@v5.7.0
         with:
           files: |
             ./docker-bake.hcl

.github/workflows/build-pr-image.yml

@@ -67,7 +67,7 @@ jobs:
           declare -A portmap=(["radarr"]="7878" ["readarr"]="8787" ["prowlarr"]="9696" ["lidarr"]="8686" ["whisparr"]="6969" ["sonarr"]="8989")
           echo "app_port=${portmap[${{ steps.gen_meta.outputs.app_name }}]}" >> $GITHUB_OUTPUT
       - name: Build and push
-        uses: docker/bake-action@v6.7.0
+        uses: docker/bake-action@v5.7.0
         with:
           files: |
             ./docker-bake.hcl

Dockerfile

@@ -11,7 +11,7 @@ ARG PULL_REQUEST_RELEASE
 LABEL build_version="Linuxserver.io Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Roxedus"
 
-ENV XDG_CONFIG_HOME="/config/xdg"
+ENV TMPDIR=/run/${APP}-temp
 
 RUN \
   if [ ${APP} == "lidarr" ]; then \
@@ -33,7 +33,8 @@ RUN \
   echo -e "UpdateMethod=docker\nBranch=${PULL_REQUEST_BRANCH}\nPackageVersion=${PULL_REQUEST_RELEASE}\nPackageAuthor=[linuxserver.io](https://www.linuxserver.io/)" > "/app/${APP}/package_info" && \
   printf "Linuxserver.io LABS \nPRARR app: ${APP}\nBranch: ${PULL_REQUEST_BRANCH}\nVersion: ${PULL_REQUEST_RELEASE}\nBuild-date: ${BUILD_DATE}" > /build_version && \
   /bin/bash -c " \
-  printf \"\$(cat /etc/s6-overlay/s6-rc.d/svc-prarr/run)\" \${APP} \${APP} \${APP^} > /etc/s6-overlay/s6-rc.d/svc-prarr/run && \
+  printf \"\$(cat /etc/s6-overlay/s6-rc.d/svc-prarr/run)\" \${APP} \${APP} \${APP^} \${APP} \${APP} \${APP^} > /etc/s6-overlay/s6-rc.d/svc-prarr/run && \
+  printf \"\$(cat /etc/s6-overlay/s6-rc.d/init-prarr-config/run)\" \${APP} \${APP} > /etc/s6-overlay/s6-rc.d/init-prarr-config/run && \
   printf \"\$(cat /etc/s6-overlay/s6-rc.d/svc-prarr/data/check)\" \${EXPOSE_PORT} > /etc/s6-overlay/s6-rc.d/svc-prarr/data/check && \
   echo \"**** cleanup ****\" && \
   rm -rf \

Dockerfile.base

@@ -1,14 +1,15 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.22
 
 # set version label
 ARG BUILD_DATE
 LABEL build_version="Linuxserver.io Build-date:- ${BUILD_DATE}"
 LABEL maintainer="Roxedus"
 
 # environment settings
-ENV XDG_CONFIG_HOME="/config/xdg"
+ENV XDG_CONFIG_HOME="/config/xdg" \
+  COMPlus_EnableDiagnostics=0
 
 RUN \
   echo "**** install packages ****" && \

root/etc/s6-overlay/s6-rc.d/init-prarr-config/run

@@ -1,6 +1,10 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-# permissions
-chown -R abc:abc \
-    /config
+mkdir -p /run/%s-temp
+
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    lsiown -R abc:abc \
+        /config \
+        /run/%s-temp
+fi

root/etc/s6-overlay/s6-rc.d/svc-prarr/run

@@ -1,7 +1,14 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 \
-    cd "/app/%s/bin" s6-setuidgid abc "/app/%s/bin/%s" \
-    -nobrowser -data=/config
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            cd "/app/%s/bin" s6-setuidgid abc "/app/%s/bin/%s" \
+            -nobrowser -data=/config
+else
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            cd "/app/%s/bin" /app/%s/bin/%s \
+            -nobrowser -data=/config
+fi