Squashed commit of the following:

commit d8ea320 Author: LinuxServer-CI <[email protected]> Date: Fri Jan 10 23:32:10 2025 +0000 Bot Updating Package Versions commit 52ed4df Author: LinuxServer-CI <[email protected]> Date: Thu Jan 9 13:44:04 2025 +0000 Bot Updating Templated Files commit 3917620 Merge: 418c317 b0ad5dc Author: Adam <[email protected]> Date: Thu Jan 9 13:42:25 2025 +0000 Merge pull request linuxserver#311 from pedorich-n/fix-rootless commit b0ad5dc Author: Nikita Pedorich <[email protected]> Date: Thu Jan 9 21:51:27 2025 +0900 fix: Rootless entrypoint commit 418c317 Author: LinuxServer-CI <[email protected]> Date: Mon Jan 6 03:05:49 2025 +0000 Bot Updating Package Versions commit af7da33 Author: LinuxServer-CI <[email protected]> Date: Fri Jan 3 23:33:30 2025 +0000 Bot Updating Package Versions commit 67b0b96 Author: LinuxServer-CI <[email protected]> Date: Wed Dec 25 23:11:22 2024 +0000 Bot Updating Package Versions commit e772abf Author: LinuxServer-CI <[email protected]> Date: Wed Dec 25 23:08:21 2024 +0000 Bot Updating Templated Files commit 95d17bc Merge: 5787812 df0fa0d Author: Roxedus <[email protected]> Date: Thu Dec 26 00:06:49 2024 +0100 Merge pull request linuxserver#309 from linuxserver/master-3.21 commit df0fa0d Author: thespad <[email protected]> Date: Mon Dec 23 18:05:25 2024 +0000 Newline commit edbd175 Author: thespad <[email protected]> Date: Mon Dec 23 18:02:59 2024 +0000 Rebase to 3.21 commit 5787812 Author: LinuxServer-CI <[email protected]> Date: Fri Dec 20 23:39:46 2024 +0000 Bot Updating Package Versions commit be4dd4b Author: LinuxServer-CI <[email protected]> Date: Fri Dec 20 23:33:34 2024 +0000 Bot Updating Templated Files commit e8c62f5 Author: LinuxServer-CI <[email protected]> Date: Fri Dec 20 23:30:54 2024 +0000 Bot Updating Templated Files commit b43e90d Author: LinuxServer-CI <[email protected]> Date: Fri Dec 6 23:40:55 2024 +0000 Bot Updating Package Versions commit c8d7639 Author: LinuxServer-CI <[email protected]> Date: Fri Dec 6 23:36:37 2024 +0000 Bot Updating Templated Files commit a5dda9b Author: LinuxServer-CI <[email protected]> Date: Fri Dec 6 23:34:50 2024 +0000 Bot Updating Templated Files commit a0b1e8a Author: LinuxServer-CI <[email protected]> Date: Fri Dec 6 23:33:15 2024 +0000 Bot Updating Templated Files commit 5f634a3 Author: LinuxServer-CI <[email protected]> Date: Wed Nov 27 02:06:47 2024 +0000 Bot Updating Package Versions
Begall · Jan 12, 2025 · 49b564c · 49b564c
1 parent e0d9958
commit 49b564c
Show file tree

Hide file tree

Showing 8 changed files with 180 additions and 132 deletions.
diff --git a/Dockerfile b/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

diff --git a/Dockerfile.aarch64 b/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

diff --git a/README.md b/README.md
@@ -78,15 +78,21 @@ Use the optional paths if you don't understand, or don't want hardlinks/atomic m
 
 The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this.
 
-
 ## Read-Only Operation
 
 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.
 
+>[!NOTE]
+>Unless a parameter is flaged as 'optional', it is *mandatory* and a value must be provided.
+
 ### docker-compose (recommended, [click here for more info](https://docs.linuxserver.io/general/docker-compose))
 
 ```yaml
@@ -130,14 +136,15 @@ Containers are configured using parameters passed at runtime (such as those abov
 
 | Parameter | Function |
 | :----: | --- |
-| `-p 8989` | The port for the Sonarr web interface |
+| `-p 8989:8989` | The port for the Sonarr web interface |
 | `-e PUID=1000` | for UserID - see below for explanation |
 | `-e PGID=1000` | for GroupID - see below for explanation |
 | `-e TZ=Etc/UTC` | specify a timezone to use, see this [list](https://en.wikipedia.org/wiki/List_of_tz_database_time_zones#List). |
 | `-v /config` | Database and sonarr configs |
 | `-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)
 
@@ -301,6 +308,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **09.01.25:** - Fix rootless entrypoint.
+* **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.

diff --git a/jenkins-vars.yml b/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'

diff --git a/package_versions.txt b/package_versions.txt
diff --git a/readme-vars.yml b/readme-vars.yml
@@ -7,35 +7,29 @@ project_logo: "https://raw.githubusercontent.com/linuxserver/docker-templates/ma
 project_blurb: |
   [{{ project_name|capitalize }}]({{ project_url }}) (formerly NZBdrone) is a PVR for usenet and bittorrent users. It can monitor multiple RSS feeds for new episodes of your favorite shows and will grab, sort and rename them. It can also be configured to automatically upgrade the quality of files already downloaded when a better quality format becomes available.
 project_lsio_github_repo_url: "https://github.com/linuxserver/docker-{{ project_name }}"
-
 # supported architectures
 available_architectures:
-  - { arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
-  - { arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
-
+  - {arch: "{{ arch_x86_64 }}", tag: "amd64-latest"}
+  - {arch: "{{ arch_arm64 }}", tag: "arm64v8-latest"}
 # development version
 development_versions: true
 development_versions_items:
-  - { tag: "latest", desc: "Stable releases from Sonarr" }
-  - { tag: "develop", desc: "Development releases from Sonarr" }
-
+  - {tag: "latest", desc: "Stable releases from Sonarr"}
+  - {tag: "develop", desc: "Development releases from Sonarr"}
 # container parameters
 param_container_name: "{{ project_name }}"
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and sonarr configs" }
-
+  - {vol_path: "/config", vol_host_path: "/path/to/{{ project_name }}/data", desc: "Database and sonarr configs"}
 opt_param_usage_include_vols: true
 opt_param_volumes:
-  - { vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Location of TV library on disk (See note in Application setup)" }
-  - { vol_path: "/downloads", vol_host_path: "/path/to/downloadclient-downloads", desc: "Location of download managers output directory (See note in Application setup)" }
-
+  - {vol_path: "/tv", vol_host_path: "/path/to/tvseries", desc: "Location of TV library on disk (See note in Application setup)"}
+  - {vol_path: "/downloads", vol_host_path: "/path/to/downloadclient-downloads", desc: "Location of download managers output directory (See note in Application setup)"}
 param_usage_include_ports: true
 param_ports:
-  - { external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr web interface" }
-
+  - {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: |
@@ -48,39 +42,78 @@ app_setup_block: |
   Use the optional paths if you don't understand, or don't want hardlinks/atomic moves.
 
   The folks over at servarr.com wrote a good [write-up](https://wiki.servarr.com/Docker_Guide#Consistent_and_well_planned_paths) on how to get started with this.
-
-
+# init diagram
+init_diagram: |
+  "sonarr:latest": {
+    docker-mods
+    base {
+      fix-attr +\nlegacy cont-init
+    }
+    docker-mods -> base
+    legacy-services
+    custom services
+    init-services -> legacy-services
+    init-services -> custom services
+    custom services -> legacy-services
+    legacy-services -> ci-service-check
+    init-migrations -> init-adduser
+    init-os-end -> init-config
+    init-config -> init-config-end
+    init-crontab-config -> init-config-end
+    init-sonarr-config -> init-config-end
+    init-config -> init-crontab-config
+    init-mods-end -> init-custom-files
+    base -> init-envfile
+    base -> init-migrations
+    init-config-end -> init-mods
+    init-mods-package-install -> init-mods-end
+    init-mods -> init-mods-package-install
+    init-adduser -> init-os-end
+    init-envfile -> init-os-end
+    init-custom-files -> init-services
+    init-config -> init-sonarr-config
+    init-services -> svc-cron
+    svc-cron -> legacy-services
+    init-services -> svc-sonarr
+    svc-sonarr -> legacy-services
+  }
+  Base Images: {
+    "baseimage-alpine:3.21"
+  }
+  "sonarr:latest" <- Base Images
 # changelog
 changelogs:
-  - { 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." }
-  - { date: "15.02.23:", desc: "Rebase master branch to Jammy." }
-  - { date: "19.12.22:", desc: "Rebase develop branch Alpine 3.17." }
-  - { date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine 3.16." }
-  - { date: "03.08.22:", desc: "Deprecate armhf." }
-  - { date: "02.08.22:", desc: "Add armhf deprecation warning." }
-  - { date: "28.04.22:", desc: "Rebase master branch to mono 6.12 base (focal)." }
-  - { date: "20.02.22:", desc: "Rebase develop branch to Alpine, deprecate develop-alpine branch." }
-  - { date: "28.12.21:", desc: "Add develop-alpine branch." }
-  - { date: "11.05.21:", desc: "Make the paths clearer to the user." }
-  - { date: "10.03.21:", desc: "Upgrade to Sonarr v3. Existing users are highly recommended to make a backup prior to update." }
-  - { date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information." }
-  - { date: "05.04.20:", desc: "Move app to /app." }
-  - { date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version." }
-  - { date: "13.06.19:", desc: "Add env variable for setting umask." }
-  - { date: "10.05.19:", desc: "Rebase to Bionic." }
-  - { date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag." }
-  - { date: "01.02.19:", desc: "Multi arch images and pipeline build logic" }
-  - { date: "15.12.17:", desc: "Fix continuation lines." }
-  - { date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push." }
-  - { date: "17.04.17:", desc: "Switch to using inhouse mono baseimage, adds python also." }
-  - { date: "14.04.17:", desc: "Change to mount /etc/localtime in README, thanks cbgj." }
-  - { date: "13.04.17:", desc: "Switch to official mono repository." }
-  - { date: "30.09.16:", desc: "Fix umask" }
-  - { date: "23.09.16:", desc: "Add cd to /opt fixes redirects with althub (issue #25), make XDG config environment variable" }
-  - { date: "15.09.16:", desc: "Add libcurl3 package." }
-  - { date: "09.09.16:", desc: "Add layer badges to README." }
-  - { date: "27.08.16:", desc: "Add badges to README." }
-  - { date: "20.07.16:", desc: "Rebase to xenial." }
-  - { date: "31.08.15:", desc: "Cleanup, changed sources to fetch binarys from. also a new baseimage." }
+  - {date: "09.01.25:", desc: "Fix rootless entrypoint."}
+  - {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."}
+  - {date: "15.02.23:", desc: "Rebase master branch to Jammy."}
+  - {date: "19.12.22:", desc: "Rebase develop branch Alpine 3.17."}
+  - {date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine 3.16."}
+  - {date: "03.08.22:", desc: "Deprecate armhf."}
+  - {date: "02.08.22:", desc: "Add armhf deprecation warning."}
+  - {date: "28.04.22:", desc: "Rebase master branch to mono 6.12 base (focal)."}
+  - {date: "20.02.22:", desc: "Rebase develop branch to Alpine, deprecate develop-alpine branch."}
+  - {date: "28.12.21:", desc: "Add develop-alpine branch."}
+  - {date: "11.05.21:", desc: "Make the paths clearer to the user."}
+  - {date: "10.03.21:", desc: "Upgrade to Sonarr v3. Existing users are highly recommended to make a backup prior to update."}
+  - {date: "18.01.21:", desc: "Deprecate `UMASK_SET` in favor of UMASK in baseimage, see above for more information."}
+  - {date: "05.04.20:", desc: "Move app to /app."}
+  - {date: "01.08.19:", desc: "Rebase to Linuxserver LTS mono version."}
+  - {date: "13.06.19:", desc: "Add env variable for setting umask."}
+  - {date: "10.05.19:", desc: "Rebase to Bionic."}
+  - {date: "23.03.19:", desc: "Switching to new Base images, shift to arm32v7 tag."}
+  - {date: "01.02.19:", desc: "Multi arch images and pipeline build logic"}
+  - {date: "15.12.17:", desc: "Fix continuation lines."}
+  - {date: "12.07.17:", desc: "Add inspect commands to README, move to jenkins build and push."}
+  - {date: "17.04.17:", desc: "Switch to using inhouse mono baseimage, adds python also."}
+  - {date: "14.04.17:", desc: "Change to mount /etc/localtime in README, thanks cbgj."}
+  - {date: "13.04.17:", desc: "Switch to official mono repository."}
+  - {date: "30.09.16:", desc: "Fix umask"}
+  - {date: "23.09.16:", desc: "Add cd to /opt fixes redirects with althub (issue #25), make XDG config environment variable"}
+  - {date: "15.09.16:", desc: "Add libcurl3 package."}
+  - {date: "09.09.16:", desc: "Add layer badges to README."}
+  - {date: "27.08.16:", desc: "Add badges to README."}
+  - {date: "20.07.16:", desc: "Rebase to xenial."}
+  - {date: "31.08.15:", desc: "Cleanup, changed sources to fetch binarys from. also a new baseimage."}
diff --git a/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run b/root/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
@@ -3,7 +3,8 @@
 
 mkdir -p /run/sonarr-temp
 
-# permissions
-lsiown -R abc:abc \
-    /config \
-    /run/sonarr-temp
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    lsiown -R abc:abc \
+        /config \
+        /run/sonarr-temp
+fi
diff --git a/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run b/root/etc/s6-overlay/s6-rc.d/svc-sonarr/run
@@ -1,7 +1,14 @@
 #!/usr/bin/with-contenv bash
 # shellcheck shell=bash
 
-exec \
-    s6-notifyoncheck -d -n 300 -w 1000 \
-        cd /app/sonarr/bin s6-setuidgid abc /app/sonarr/bin/Sonarr \
-        -nobrowser -data=/config
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    exec \
+        s6-notifyoncheck -d -n 300 -w 1000 \
+            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 /app/sonarr/bin/Sonarr \
+            -nobrowser -data=/config
+fi