Merge pull request #309 from linuxserver/master-3.21

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:3.21
 
 # set version label
 ARG BUILD_DATE

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.20
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.21
 
 # set version label
 ARG BUILD_DATE

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'

README.md

@@ -82,6 +82,10 @@ The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/D
 
 This image can be run with a read-only container filesystem. For details please [read the docs](https://docs.linuxserver.io/misc/read-only/).
 
+## Non-Root Operation
+
+This image can be run with a non-root user. For details please [read the docs](https://docs.linuxserver.io/misc/non-root/).
+
 ## Usage
 
 To help you get started creating a container from this image you can either use docker-compose or the docker cli.
@@ -140,6 +144,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-v /tv` | Location of TV library on disk (See note in Application setup) |
 | `-v /downloads` | Location of download managers output directory (See note in Application setup) |
 | `--read-only=true` | Run container with a read-only filesystem. Please [read the docs](https://docs.linuxserver.io/misc/read-only/). |
+| `--user=1000:1000` | Run container with a non-root user. Please [read the docs](https://docs.linuxserver.io/misc/non-root/). |
 
 ## Environment variables from files (Docker secrets)
 
@@ -303,6 +308,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.12.24:** - Rebase Alpine 3.21.
 * **31.05.24:** - Rebase Alpine 3.20.
 * **12.01.24:** - Update download url.
 * **30.12.23:** - Rebase master branch to Alpine 3.19.

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'

readme-vars.yml

@@ -29,6 +29,7 @@ param_usage_include_ports: true
 param_ports:
   - {external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr web interface"}
 readonly_supported: true
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -86,6 +87,7 @@ init_diagram: |
   "sonarr:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "23.12.24:", desc: "Rebase Alpine 3.21."}
   - {date: "31.05.24:", desc: "Rebase Alpine 3.20."}
   - {date: "12.01.24:", desc: "Update download url."}
   - {date: "30.12.23:", desc: "Rebase master branch to Alpine 3.19."}

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

@@ -3,7 +3,8 @@
 
 mkdir -p /run/sonarr-temp
 
-# permissions
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-lsiown -R abc:abc \
+    lsiown -R abc:abc \
-    /config \
+        /config \
-    /run/sonarr-temp
+        /run/sonarr-temp
+fi

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

@@ -1,7 +1,14 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-exec \
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
-    s6-notifyoncheck -d -n 300 -w 1000 \
+    exec \
-        cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
+        s6-notifyoncheck -d -n 300 -w 1000 \
-        -nobrowser -data=/config
+            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 \
+            -nobrowser -data=/config
+fi