Rebase to 3.21

Author: thespad

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

README.md

@@ -75,6 +75,10 @@ Note that if you want to use [Airsonic's Java jukebox player](https://airsonic.g
 
 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.
@@ -149,6 +153,7 @@ Containers are configured using parameters passed at runtime (such as those abov
 | `-v /media` | Location of other media. |
 | `--device /dev/snd` | Only needed to pass your host sound device to Airsonic's Java jukebox player. |
 | `--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)
 
@@ -312,6 +317,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **21.12.24:** - Rebase to Alpine 3.21.
 * **24.05.24:** - Rebase to Alpine 3.20.
 * **20.03.24:** - Rebase to Alpine 3.19.
 * **30.05.23:** - Rebase to Alpine 3.18.

readme-vars.yml

@@ -34,6 +34,7 @@ opt_param_device_map: true
 opt_param_devices:
   - {device_path: "/dev/snd", device_host_path: "/dev/snd", desc: "Only needed to pass your host sound device to Airsonic's Java jukebox player."}
 readonly_supported: true
+nonroot_supported: true
 # application setup block
 app_setup_block_enabled: true
 app_setup_block: |
@@ -93,6 +94,7 @@ init_diagram: |
   "airsonic-advanced:latest" <- Base Images
 # changelog
 changelogs:
+  - {date: "21.12.24:", desc: "Rebase to Alpine 3.21."}
   - {date: "24.05.24:", desc: "Rebase to Alpine 3.20."}
   - {date: "20.03.24:", desc: "Rebase to Alpine 3.19."}
   - {date: "30.05.23:", desc: "Rebase to Alpine 3.18."}

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

@@ -4,7 +4,9 @@
 mkdir -p "${AIRSONIC_ADVANCED_SETTINGS}"/transcode
 mkdir -p "/run/tomcat.4040"
 
-lsiown -R abc:abc /config "${AIRSONIC_ADVANCED_SETTINGS}" /run/tomcat.4040
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
+    lsiown -R abc:abc /config "${AIRSONIC_ADVANCED_SETTINGS}" /run/tomcat.4040
+fi
 
 if [[ ! -e "${AIRSONIC_ADVANCED_SETTINGS}"/transcode/ffmpeg || ! -e  "${AIRSONIC_ADVANCED_SETTINGS}"/transcode/flac || ! -e "${AIRSONIC_ADVANCED_SETTINGS}"/transcode/lame  ]]; then
     ln -sf /usr/bin/ffmpeg "${AIRSONIC_ADVANCED_SETTINGS}"/transcode/

root/etc/s6-overlay/s6-rc.d/svc-airsonic-advanced/run

@@ -12,19 +12,37 @@ URL_BASE="/${CONTEXT_PATH}"
 # add option to pass runtime arguments
 IFS=" " read -r -a RUN_ARRAY <<< "$JAVA_OPTS"
 
+if [[ -z ${LSIO_NON_ROOT_USER} ]]; then
 exec \
-    s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 4040" \
-    cd "${AIRSONIC_ADVANCED_HOME}" s6-setuidgid abc \
-        java \
-            -Dlog4j2.formatMsgNoLookups=true \
-            -Dairsonic.defaultMusicFolder=/music \
-            -Dairsonic.defaultPlaylistFolder=/playlists \
-            -Dairsonic.defaultPodcastFolder=/podcasts \
-            -Dairsonic.home="${AIRSONIC_ADVANCED_SETTINGS}" \
-            -Djava.awt.headless=true \
-            -Djava.io.tmpdir="/run/tomcat.4040" \
-            -Dserver.servlet.context-path="${URL_BASE}" \
-            -Dserver.host=0.0.0.0 \
-            -Dserver.port=4040 \
-            "${RUN_ARRAY[@]}" \
-            -jar airsonic.war
+        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 4040" \
+        cd "${AIRSONIC_ADVANCED_HOME}" s6-setuidgid abc \
+            java \
+                -Dlog4j2.formatMsgNoLookups=true \
+                -Dairsonic.defaultMusicFolder=/music \
+                -Dairsonic.defaultPlaylistFolder=/playlists \
+                -Dairsonic.defaultPodcastFolder=/podcasts \
+                -Dairsonic.home="${AIRSONIC_ADVANCED_SETTINGS}" \
+                -Djava.awt.headless=true \
+                -Djava.io.tmpdir="/run/tomcat.4040" \
+                -Dserver.servlet.context-path="${URL_BASE}" \
+                -Dserver.host=0.0.0.0 \
+                -Dserver.port=4040 \
+                "${RUN_ARRAY[@]}" \
+                -jar airsonic.war
+else
+        s6-notifyoncheck -d -n 300 -w 1000 -c "nc -z localhost 4040" \
+        cd "${AIRSONIC_ADVANCED_HOME}" \
+            java \
+                -Dlog4j2.formatMsgNoLookups=true \
+                -Dairsonic.defaultMusicFolder=/music \
+                -Dairsonic.defaultPlaylistFolder=/playlists \
+                -Dairsonic.defaultPodcastFolder=/podcasts \
+                -Dairsonic.home="${AIRSONIC_ADVANCED_SETTINGS}" \
+                -Djava.awt.headless=true \
+                -Djava.io.tmpdir="/run/tomcat.4040" \
+                -Dserver.servlet.context-path="${URL_BASE}" \
+                -Dserver.host=0.0.0.0 \
+                -Dserver.port=4040 \
+                "${RUN_ARRAY[@]}" \
+                -jar airsonic.war
+fi