Rebase to 3.17, migrate to s6v3

Author: thespad

Dockerfile

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -12,11 +12,9 @@ RUN \
     autoconf \
     automake \
     avahi-dev \
-    bash \
     bison \
     bsd-compat-headers \
     confuse-dev \
-    curl \
     curl-dev \
     ffmpeg-dev \
     file \
@@ -28,12 +26,11 @@ RUN \
     gnutls-dev \
     gperf \
     json-c-dev \
-    libcurl \
     libevent-dev \
     libgcrypt-dev \
     libogg-dev \
     libplist-dev \
-    libressl-dev \
+    openssl-dev \
     libsodium-dev \
     libtool \
     libunistring-dev \
@@ -43,8 +40,7 @@ RUN \
     openjdk8-jre-base \
     protobuf-c-dev \
     sqlite-dev \
-    taglib-dev \
-    tar && \
+    taglib-dev && \
   echo "**** make antlr wrapper ****" && \
   mkdir -p \
     /tmp/source/owntone && \
@@ -105,7 +101,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:3.17
 
 # set version label
 ARG BUILD_DATE
@@ -118,17 +114,15 @@ RUN \
   apk add -U --update --no-cache \
     avahi \
     confuse \
-    curl \
     dbus \
     ffmpeg \
     json-c \
-    libcurl \
     libevent \
     libgcrypt \
     libplist \
-    libressl \
     libsodium \
     libunistring \
+    libuuid \
     libwebsockets \
     mxml \
     protobuf-c \

Dockerfile.aarch64

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -10,11 +10,9 @@ RUN \
     autoconf \
     automake \
     avahi-dev \
-    bash \
     bison \
     bsd-compat-headers \
     confuse-dev \
-    curl \
     curl-dev \
     ffmpeg-dev \
     file \
@@ -26,23 +24,21 @@ RUN \
     gnutls-dev \
     gperf \
     json-c-dev \
-    libcurl \
     libevent-dev \
     libgcrypt-dev \
     libogg-dev \
     libplist-dev \
-    libressl-dev \
     libsodium-dev \
     libtool \
     libunistring-dev \
     libwebsockets-dev \
     make \
     mxml-dev \
     openjdk8-jre-base \
+    openssl-dev \
     protobuf-c-dev \
     sqlite-dev \
-    taglib-dev \
-    tar && \
+    taglib-dev && \
   echo "**** make antlr wrapper ****" && \
   mkdir -p \
     /tmp/source/owntone && \
@@ -96,7 +92,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm64v8-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -109,17 +105,15 @@ RUN \
   apk add -U --update --no-cache \
     avahi \
     confuse \
-    curl \
     dbus \
     ffmpeg \
     json-c \
-    libcurl \
     libevent \
     libgcrypt \
     libplist \
-    libressl \
     libsodium \
     libunistring \
+    libuuid \
     libwebsockets \
     mxml \
     protobuf-c \

Dockerfile.armhf

@@ -1,4 +1,4 @@
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15 as buildstage
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17 as buildstage
 ############## build stage ##############
 
 ARG DAAPD_RELEASE
@@ -10,11 +10,9 @@ RUN \
     autoconf \
     automake \
     avahi-dev \
-    bash \
     bison \
     bsd-compat-headers \
     confuse-dev \
-    curl \
     curl-dev \
     ffmpeg-dev \
     file \
@@ -26,23 +24,21 @@ RUN \
     gnutls-dev \
     gperf \
     json-c-dev \
-    libcurl \
     libevent-dev \
     libgcrypt-dev \
     libogg-dev \
     libplist-dev \
-    libressl-dev \
     libsodium-dev \
     libtool \
     libunistring-dev \
     libwebsockets-dev \
     make \
     mxml-dev \
     openjdk8-jre-base \
+    openssl-dev \
     protobuf-c-dev \
     sqlite-dev \
-    taglib-dev \
-    tar && \
+    taglib-dev && \
   echo "**** make antlr wrapper ****" && \
   mkdir -p \
     /tmp/source/owntone && \
@@ -96,7 +92,7 @@ RUN \
   mv /tmp/daapd-build/etc/owntone.conf /tmp/daapd-build/etc/owntone.conf.orig && \
   rm -rf /tmp/daapd-build/var
 ############## runtime stage ##############
-FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.15
+FROM ghcr.io/linuxserver/baseimage-alpine:arm32v7-3.17
 
 # set version label
 ARG BUILD_DATE
@@ -109,17 +105,15 @@ RUN \
   apk add -U --update --no-cache \
     avahi \
     confuse \
-    curl \
     dbus \
     ffmpeg \
     json-c \
-    libcurl \
     libevent \
     libgcrypt \
     libplist \
-    libressl \
     libsodium \
     libunistring \
+    libuuid \
     libwebsockets \
     mxml \
     protobuf-c \

README.md

@@ -97,8 +97,8 @@ services:
       - PGID=1000
       - TZ=Etc/UTC
     volumes:
-      - <path to data>:/config
-      - <path to music>:/music
+      - /path/to/data:/config
+      - /path/to/music:/music
     restart: unless-stopped
 ```
 
@@ -111,8 +111,8 @@ docker run -d \
   -e PUID=1000 \
   -e PGID=1000 \
   -e TZ=Etc/UTC \
-  -v <path to data>:/config \
-  -v <path to music>:/music \
+  -v /path/to/data:/config \
+  -v /path/to/music:/music \
   --restart unless-stopped \
   lscr.io/linuxserver/daapd:latest
 
@@ -240,6 +240,7 @@ Once registered you can define the dockerfile to use with `-f Dockerfile.aarch64
 
 ## Versions
 
+* **23.02.23:** - Rebase to Alpine 3.17, migrate to s6v3.
 * **31.05.22:** - Make sure the user has access to the audio device.
 * **31.05.22:** - Add new deps, flex and bison.
 * **12.02.22:** - Rebase to Alpine 3.15.

readme-vars.yml

@@ -28,8 +28,8 @@ param_env_vars:
   - { env_var: "TZ", env_value: "Europe/London", desc: "Specify a timezone to use EG Europe/London." }
 param_usage_include_vols: true
 param_volumes:
-  - { vol_path: "/config", vol_host_path: "<path to data>", desc: "Where daapd server stores its config and dbase files." }
-  - { vol_path: "/music", vol_host_path: "<path to music>", desc: "Map to your music folder." }
+  - { vol_path: "/config", vol_host_path: "/path/to/data", desc: "Where daapd server stores its config and dbase files." }
+  - { vol_path: "/music", vol_host_path: "/path/to/music", desc: "Map to your music folder." }
 param_usage_include_ports: false
 param_device_map: false
 cap_add_param: false
@@ -65,6 +65,7 @@ app_setup_block: |
 
 # changelog
 changelogs:
+  - { date: "23.02.23:", desc: "Rebase to Alpine 3.17, migrate to s6v3." }
   - { date: "31.05.22:", desc: "Make sure the user has access to the audio device." }
   - { date: "31.05.22:", desc: "Add new deps, flex and bison." }
   - { date: "12.02.22:", desc: "Rebase to Alpine 3.15." }

root/etc/cont-init.d/30-dbus

@@ -1,4 +1,5 @@
 #!/usr/bin/with-contenv bash
+# shellcheck shell=bash
 
 FILES=$(find /dev/snd -type c -print 2>/dev/null)
 

root/etc/s6-overlay/s6-rc.d/init-audio-config/dependencies.d/init-daapd-config

@@ -0,0 +1 @@
+oneshot

root/etc/cont-init.d/50-gid-audio …s6-overlay/s6-rc.d/init-audio-config/runroot/etc/cont-init.d/50-gid-audio renamed to root/etc/s6-overlay/s6-rc.d/init-audio-config/run root/etc/cont-init.d/50-gid-audio renamed to root/etc/s6-overlay/s6-rc.d/init-audio-config/run

@@ -0,0 +1 @@
+/etc/s6-overlay/s6-rc.d/init-audio-config/run