Merge pull request #263 from linuxserver/develop-3.18

Dockerfile

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:3.18
 
 # set version label
 ARG BUILD_DATE
@@ -15,7 +15,7 @@ ENV SONARR_BRANCH="develop"
 
 RUN \
   echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
+  apk add --no-cache \
     icu-libs \
     sqlite-libs && \
   echo "**** install sonarr ****" && \

Dockerfile.aarch64

@@ -1,6 +1,6 @@
 # syntax=docker/dockerfile:1
 
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.18
 
 # set version label
 ARG BUILD_DATE
@@ -15,7 +15,7 @@ ENV SONARR_BRANCH="develop"
 
 RUN \
   echo "**** install packages ****" && \
-  apk add -U --upgrade --no-cache \
+  apk add --no-cache \
     icu-libs \
     sqlite-libs && \
   echo "**** install sonarr ****" && \

README.md

@@ -70,6 +70,14 @@ This image provides various versions that are available via tags. Please read th
 
 Access the webui at `<your-ip>:8989`, for more information check out [Sonarr](https://sonarr.tv/).
 
+### Media folders
+
+We have set `/tv` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content.
+
+Use the optional paths if you dont understand, or dont 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.
+
 ## Usage
 
 Here are some example snippets to help you get started creating a container.
@@ -236,7 +244,8 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
-* **19.12.22:** - Rebase develop branch Alpine 3.17.
+* **30.05.23:** - Rebase to Alpine 3.18.
+* **19.12.22:** - Rebase develop branch to Alpine 3.17.
 * **24.11.22:** - Bump develop branch to v4, rebase to Alpine.
 * **03.08.22:** - Deprecate armhf.
 * **02.08.22:** - Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine.

readme-vars.yml

@@ -30,10 +30,8 @@ param_volumes:
 param_usage_include_ports: true
 param_ports:
   - { external_port: "8989", internal_port: "8989", port_desc: "The port for the Sonarr webinterface" }
-param_usage_include_env: true
-param_env_vars:
-  - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London, this is required for Sonarr"}
-# optional env variables
+
+param_usage_include_env: false
 opt_param_usage_include_env: false
 
 # application setup block
@@ -41,9 +39,18 @@ app_setup_block_enabled: true
 app_setup_block: |
   Access the webui at `<your-ip>:8989`, for more information check out [Sonarr](https://sonarr.tv/).
 
+  ### Media folders
+
+  We have set `/tv` and `/downloads` as ***optional paths***, this is because it is the easiest way to get started. While easy to use, it has some drawbacks. Mainly losing the ability to hardlink (TL;DR a way for a file to exist in multiple places on the same file system while only consuming one file worth of space), or atomic move (TL;DR instant file moves, rather than copy+delete) files while processing content.
+
+  Use the optional paths if you dont understand, or dont 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.
+
 # changelog
 changelogs:
-  - { date: "19.12.22:", desc: "Rebase develop branch Alpine 3.17." }
+  - { date: "30.05.23:", desc: "Rebase to Alpine 3.18." }
+  - { date: "19.12.22:", desc: "Rebase develop branch to Alpine 3.17." }
   - { date: "24.11.22:", desc: "Bump develop branch to v4, rebase to Alpine." }
   - { date: "03.08.22:", desc: "Deprecate armhf." }
   - { date: "02.08.22:", desc: "Rebase develop branch to Ubuntu Focal due to dropping of mono support on Alpine." }

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

@@ -1 +1 @@
-oneshot
+oneshot

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

@@ -1 +1 @@
-/etc/s6-overlay/s6-rc.d/init-sonarr-config/run
+/etc/s6-overlay/s6-rc.d/init-sonarr-config/run

root/etc/s6-overlay/s6-rc.d/svc-sonarr/notification-fd

@@ -1 +1 @@
-3
+3

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

@@ -1 +1 @@
-longrun
+longrun