Version 5.0 Major Release.

New Features:
Multi-Channel and High-Resolution Audio Support
48,000 frames per second ("48k") operation.
48k lossless stereo support.
5.1 and 7.1 surround sound support.
Multi-channel and multi-rate operation on ALSA, PipeWire, PulseAudio, FreeBSD, stdout and Unix pipe output backends.
Automatic Audio Format Selection
Flexible and controllable output format selection.
Automatic rate, sample format, and channel count selection.
Full FFmpeg Integration
Support for transcoding.
Advanced resampling capabilities.
New audio format support.
Enhanced Resampling
New vernier resampling and interpolation method optimized for low-power CPUs.
Better performance on resource-constrained devices.

Convolution and Loudness Enhancements:
Convolution system is now multithreaded and works on stereo and multichannel audio at 48k and 44.1k.
Multiple impulse response (IR) files can now be provided via convolution_ir_files setting.
New convolution_thread_pool_size setting for multithreaded processing (defaults to 1).
Loudness processing now works with stereo and multichannel audio at 48k and 44.1k.
Updated to the most recent HiFi-LoFi FFT convolver.

MQTT Enhancements:
Added new publish_retain boolean option. When enabled, published MQTT messages have the retain flag set, so the MQTT broker stores the last message per topic and new subscribers receive the most recent value immediately. Thanks to lululombard for PR #2142.

D-Bus Enhancements:
Added new dbus_default_message_bus command-line argument (can be system or session) to set the default message bus for both D-Bus native service and MPRIS service.

Performance Improvements:
Enhanced compatibility with AirPlay 2 AutoMix and Smart Tracklists resulting in less unexplained track skipping.
Better operation on low-power devices down to Raspberry Pi B.
Improved efficiency on embedded systems.
Enhanced timestamp handling for better synchronization.
Improved sync error calculation.
Rebuilt buffered audio processor for cleaner handling of immediate and deferred flush requests.

Docker Enhancements:
Reduced Docker image sizes with slimmed-down FFmpeg library.
Removed dhclient from Docker images for smaller footprint.

Bug Fixes:
Fixed MQTT warning on service startup: "Could not establish a mqtt connection". The startup script now correctly states that the mosquitto service is required. Thanks to Hugo Villeneuve for PR #2137.
Fixed compatibility with mbedtls library version 3.4+ (present on recent Linux versions). Thanks to Christian Beier for finding and fixing the bug.
Fixed PulseAudio backend so that PA_ERR_NODATA returns "No latency data yet". Thanks to Vladimir Shakov for the report and fix.
Ensured old flush requests are deleted when a new play session starts. Thanks to saujanyashah for the report.
Fixed format warnings on 64-bit and 32-bit systems
Removed compilation warnings on 32-bit builds
Improved argument checking for debug(), inform(), warn() and die() functions
Fixed "daemon" typos throughout codebase. Thanks to Chris Boot for PR #1981.
Added warning if a convolution impulse response file cannot be read due to bad path or permissions

Build System Improvements:
Unified service file with variable substitution for Avahi support, making it easier to add future service dependencies. Thanks to Hugo Villeneuve.
Network interface selection now only considers interfaces that are up, running and not loopback interfaces. Thanks to Carl Johnson for the suggestion.
Configuration File Changes and Deprecations

New settings: convolution_ir_files (replaces convolution_ir_file), convolution_enabled (replaces convolution), convolution_max_length_in_seconds (replaces convolution_max_length), loudness_enabled (replaces loudness).
New convolution_thread_pool_size setting (defaults to 1).
Deprecated settings: convolution_ir_file, convolution, convolution_max_length, loudness.
Corresponding D-Bus methods and properties have been updated.

Deprecation Notice:
The Jack Audio and soundio backends are deprecated and will be removed in a future release. Consider using the updated PipeWire backend instead.

Documentation Updates
Updated BUILD.md with latest build instructions.
Updated AIRPLAY2.md with feature information.
Enhanced convolution and loudness documentation.

Maintenance:
Fixed FFmpeg deprecation warnings.
Bumped actions/checkout from 6.0.1 to 6.0.2.
Bumped docker/login-action from 3.6.0 to 3.7.0.
Bumped docker/build-push-action from 6.13.0 to 6.15.0.
Bumped docker/setup-qemu-action from 3.4.0 to 3.6.0.
Bumped docker/setup-buildx-action from 3.9.0 to 3.10.0.

docker/Dockerfile

@@ -1,44 +1,51 @@
 ARG NQPTP_BRANCH=main
+ARG FFMPEG_BRANCH=release/7.1
 ARG SHAIRPORT_SYNC_BRANCH=.
+ARG ALPINE_VERSION=20250108
 
-FROM alpine:3.20 AS builder
-
-RUN apk -U add \
-        alsa-lib-dev \
-        autoconf \
-        automake \
-        avahi-dev \
-        build-base \
-        dbus \
-        ffmpeg-dev \
-        git \
-        libconfig-dev \
-        libgcrypt-dev \
-        libplist-dev \
-        libressl-dev \
-        libsndfile-dev \
-        libsodium-dev \
-        libtool \
-        pipewire-dev \
-        mosquitto-dev \
-        popt-dev \
-        pulseaudio-dev \
-        soxr-dev \
-        xxd
-
-##### ALAC #####
-FROM builder AS alac
-RUN git clone --depth=1 https://github.com/mikebrady/alac
-WORKDIR /alac
-RUN autoreconf -i
-RUN ./configure
+##### FFMPEGLITE #####
+FROM alpine:$ALPINE_VERSION AS ffmpeglite
+RUN apk -U add build-base git nasm pkgconf
+RUN mkdir -p /ffmpeg_sources /ffmpeg_build
+WORKDIR /ffmpeg_sources
+ARG FFMPEG_BRANCH
+RUN git clone --depth=1 -b "$FFMPEG_BRANCH" https://github.com/FFmpeg/FFmpeg
+WORKDIR /ffmpeg_sources/FFmpeg
+RUN ./configure \
+  --prefix="/ffmpeg_build" \
+  --extra-libs="-lpthread -lm" \
+  --ld="g++" \
+  --disable-static \
+  --enable-shared \
+  --enable-gpl \
+  --disable-programs \
+  --disable-everything \
+  --disable-doc \
+  --disable-iconv \
+  --disable-avdevice \
+  --disable-avfilter \
+  --disable-swscale \
+  --disable-network \
+  --disable-iamf \
+  --disable-pixelutils \
+  --disable-postproc \
+  --enable-decoder=alac \
+  --enable-decoder=aac
 RUN make -j $(nproc)
 RUN make install
-WORKDIR /
-##### ALAC END #####
+##### FFMPEGLITE END #####
+
 
 ##### NQPTP #####
-FROM builder AS nqptp
+FROM alpine:$ALPINE_VERSION AS nqptp
+RUN apk -U add \
+        musl-dev \
+        autoconf \
+        automake \
+        build-base \
+        git \
+        linux-headers
+
 ARG NQPTP_BRANCH
 RUN git clone --depth=1 -b "$NQPTP_BRANCH" https://github.com/mikebrady/nqptp
 WORKDIR /nqptp
@@ -49,19 +56,52 @@ WORKDIR /
 ##### NQPTP END #####
 
 ##### SPS #####
-# Note: apple-alac requires alac build first.
-FROM alac AS shairport-sync
-ARG SHAIRPORT_SYNC_BRANCH
+FROM alpine:$ALPINE_VERSION AS shairport-sync
+RUN apk -U add \
+        pkgconf \
+        alsa-lib-dev \
+        autoconf \
+        automake \
+        avahi-dev \
+        build-base \
+        dbus \
+        git \
+        libconfig-dev \
+        libgcrypt-dev \
+        libplist-dev \
+        openssl-dev \
+        libsndfile-dev \
+        libsodium-dev \
+        libtool \
+        pipewire-dev \
+        mosquitto-dev \
+        popt-dev \
+        pulseaudio-dev \
+        soxr-dev \
+        libplist-util \
+        xxd
 
+ARG SHAIRPORT_SYNC_BRANCH
 WORKDIR /shairport-sync
 COPY . .
-RUN git checkout "$SHAIRPORT_SYNC_BRANCH"
+RUN rm -rf build
+# the above three lines or the following...
+# RUN git clone --depth=1 -b "SHAIRPORT_SYNC_BRANCH" https://github.com/mikebrady/sps-private shairport-sync
+
+COPY --from=ffmpeglite /ffmpeg_build/lib/ /usr/local/lib
+COPY --from=ffmpeglite /ffmpeg_build/lib/pkgconfig/*.pc  /usr/local/lib/pkgconfig/
+COPY --from=ffmpeglite /ffmpeg_build/include/  /usr/local/include
+
+# RUN git checkout "$SHAIRPORT_SYNC_BRANCH"
+# the following is to remove any build directory that might be there
+# not needed if the source is a clone of the repository
+# RUN rm -rf build
 WORKDIR /shairport-sync/build
 RUN autoreconf -i ../
-RUN CFLAGS="-O3" CXXFLAGS="-O3" ../configure --sysconfdir=/etc --with-alsa --with-pa --with-soxr --with-avahi --with-ssl=openssl \
+RUN ../configure --sysconfdir=/etc --with-alsa --with-pulseaudio --with-soxr --with-avahi --with-ssl=openssl \
         --with-airplay-2 --with-metadata --with-dummy --with-pipe --with-dbus-interface \
         --with-stdout --with-mpris-interface --with-mqtt-client \
-        --with-apple-alac --with-convolution --with-pw
+        --with-convolution --with-pipewire
 RUN make -j $(nproc)
 RUN DESTDIR=install make install
 WORKDIR /
@@ -72,17 +112,15 @@ FROM scratch AS files
 
 # Add run script that will start SPS
 COPY --chmod=755 ./docker/run.sh ./run.sh
-COPY ./docker/etc/s6-overlay/s6-rc.d /etc/s6-overlay/s6-rc.d
 COPY ./docker/etc/pulse /etc/pulse
 ##### END STATIC FILES #####
 
 ##### BUILD FILES #####
 FROM scratch AS build-files
-
+COPY --from=ffmpeglite /ffmpeg_build/lib/ /usr/local/lib
 COPY --from=shairport-sync /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync
 COPY --from=shairport-sync /shairport-sync/build/install/usr/local/share/man/man1 /usr/share/man/man1
 COPY --from=nqptp /nqptp/nqptp /usr/local/bin/nqptp
-COPY --from=alac /usr/local/lib/libalac.* /usr/local/lib/
 COPY --from=shairport-sync /shairport-sync/build/install/etc/shairport-sync.conf /etc/
 COPY --from=shairport-sync /shairport-sync/build/install/etc/shairport-sync.conf.sample /etc/
 COPY --from=shairport-sync /shairport-sync/build/install/etc/dbus-1/system.d/shairport-sync-dbus.conf /etc/dbus-1/system.d/
@@ -90,53 +128,43 @@ COPY --from=shairport-sync /shairport-sync/build/install/etc/dbus-1/system.d/sha
 ##### END BUILD FILES #####
 
 # Shairport Sync Runtime System
-FROM crazymax/alpine-s6:3.20-3.2.0.2
-
-ENV S6_CMD_WAIT_FOR_SERVICES=1
-ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
-
+FROM alpine:$ALPINE_VERSION
+COPY --from=build-files / /
 RUN apk -U add \
         alsa-lib \
         avahi \
-        avahi-tools \
         dbus \
-        ffmpeg \
         glib \
-        less \
-        less-doc \
         libconfig \
         libgcrypt \
         libplist \
+        pipewire \
         libpulse \
-        libressl3.8-libcrypto \
-        libsndfile \
+        libcrypto3 \
         libsodium \
         libuuid \
-        pipewire \
-        man-pages \
-        mandoc \
         mosquitto \
         popt \
         soxr \
         curl
 
 RUN rm -rfv /lib/apk/db/* && \
-    rm -rfv /etc/avahi/services/*.service && \
-    addgroup shairport-sync && \
-    adduser -D shairport-sync -G shairport-sync && \
-    addgroup -g 29 docker_audio && \
-    addgroup shairport-sync docker_audio && \
-    addgroup shairport-sync audio && \
-    mkdir -p /run/dbus
+        rm -rfv /etc/avahi/services/*.service && \
+        rm -rf /usr/share/man && \
+        addgroup shairport-sync && \
+        adduser -D shairport-sync -G shairport-sync && \
+        addgroup -g 29 docker_audio && \
+        addgroup shairport-sync docker_audio && \
+        addgroup shairport-sync audio && \
+        mkdir -p /run/dbus
 
-# Remove anything we don't need.
-# Remove any statically-defined Avahi services, e.g. SSH and SFTP
+# Removed anything we don't need.
+# Removed any statically-defined Avahi services, e.g. SSH and SFTP
 
-# Create non-root user for running the container -- running as the user 'shairport-sync' also allows
+# Created non-root user for running the container -- running as the user 'shairport-sync' also allows
 # Shairport Sync to provide the D-Bus and MPRIS interfaces within the container
-# Add the shairport-sync user to the pre-existing audio group, which has ID 29, for access to the ALSA stuff
+# Added the shairport-sync user to the pre-existing audio group, which has ID 29, for access to the ALSA stuff
 
 COPY --from=files / /
-COPY --from=build-files / /
-
-ENTRYPOINT ["/init","./run.sh"]
+ENV ENABLE_AVAHI=1
+ENTRYPOINT ["./run.sh"]

docker/README.md

@@ -19,13 +19,13 @@ See the `docker-compose.yaml` file in this folder for an example.
 To run the latest release of Shairport Sync, which provides AirPlay 2 service:
 
 ```
-$ docker run -d --restart unless-stopped --net host --device /dev/snd \
+$ docker run -d --cap-add=SYS_NICE --restart unless-stopped --net host --device /dev/snd \
     mikebrady/shairport-sync:latest
 ```
 To run the classic version:
 
 ```
-$ docker run -d --restart unless-stopped --net host --device /dev/snd \
+$ docker run -d --cap-add=SYS_NICE --restart unless-stopped --net host --device /dev/snd \
     mikebrady/shairport-sync:latest-classic
 ```
 
@@ -34,13 +34,18 @@ $ docker run -d --restart unless-stopped --net host --device /dev/snd \
 Command line options will be passed to Shairport Sync. Here is an example:
 
 ```
-$ docker run -d --restart unless-stopped --net host --device /dev/snd \
+$ docker run -d --cap-add=SYS_NICE --restart unless-stopped --net host --device /dev/snd \
     mikebrady/shairport-sync:latest \
     -v --statistics -a DenSystem -- -d hw:0 -c PCM
 ```
 This will send audio to alsa hardware device `hw:0` and make use of the that device's mixer control called `PCM`. The service will be visible as `DenSystem` on the network.
 
-The image is built with PulseAudio backend support. To use it, refer to [`docker-compose.yaml`](docker-compose.yaml) for required environment variables and mounts. You might need to adjust authentication on your PulseAudio server ([PA documentation](https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Modules/#module-native-protocol-unixtcp)) and set default backend to `pa` via either command line option `-o` or `general.output_backend` field in config file.
+The image is built with PipeWire and PulseAudio backend support. To use it, refer to [`docker-compose.yaml`](docker-compose.yaml) for required environment variables and mounts.
+
+To use the PipeWire backend, set the backend to `pipewire` via either command line option `-o pipewire ` or the `output_backend` field in the `general` section of the configuration file.
+
+Similarly, to use the PulseAudio backend, set the backend to `pulseaudio` via either command line option `-o pulseaudio ` or the `output_backend` field in the `general` section of the configuration file.
+For use with PulseAudio, you might need to adjust authentication on your PulseAudio server ([PA documentation](https://www.freedesktop.org/wiki/Software/PulseAudio/Documentation/User/Modules/#module-native-protocol-unixtcp)).
 
 ## Configuration File
 

docker/classic/Dockerfile

@@ -1,15 +1,45 @@
+# Classic Shairport-Sync build. Note: the only decoder in FFmpeg is ALAC.
+
 ARG SHAIRPORT_SYNC_BRANCH=.
+ARG FFMPEG_BRANCH=release/7.1
+ARG ALPINE_VERSION=20250108
 
-FROM alpine:3.20 AS builder
+##### FFMPEGLITE #####
+FROM alpine:$ALPINE_VERSION AS ffmpeglite
+RUN apk -U add build-base git nasm pkgconf
+RUN mkdir -p /ffmpeg_sources /ffmpeg_build
+WORKDIR /ffmpeg_sources
+ARG FFMPEG_BRANCH
+RUN git clone --depth=1 -b "$FFMPEG_BRANCH" https://github.com/FFmpeg/FFmpeg
+WORKDIR /ffmpeg_sources/FFmpeg
+RUN ./configure \
+  --prefix="/ffmpeg_build" \
+  --extra-libs="-lpthread -lm" \
+  --ld="g++" \
+  --disable-static \
+  --enable-shared \
+  --enable-gpl \
+  --disable-programs \
+  --disable-everything \
+  --disable-doc \
+  --disable-iconv \
+  --disable-avdevice \
+  --disable-avfilter \
+  --disable-swscale \
+  --disable-network \
+  --disable-iamf \
+  --disable-pixelutils \
+  --disable-postproc \
+  --enable-decoder=alac
+RUN make
+RUN make install
+##### FFMPEGLITE END #####
 
-# Classic (aka AirPlay 1) Build
-
-# Check required arguments exist. These will be provided by the Github Action
-# Workflow and are required to ensure the correct branches are being used.
-ARG SHAIRPORT_SYNC_BRANCH
-RUN test -n "$SHAIRPORT_SYNC_BRANCH"
+##### SPS #####
+FROM alpine:$ALPINE_VERSION AS shairport-sync
 
 RUN apk -U add \
+        pkgconf \
         alsa-lib-dev \
         autoconf \
         automake \
@@ -18,96 +48,96 @@ RUN apk -U add \
         dbus \
         git \
         libconfig-dev \
+        openssl-dev \
         libsndfile-dev \
         libtool \
-        openssl-dev \
+        pipewire-dev \
         mosquitto-dev \
         popt-dev \
         pulseaudio-dev \
-        soxr-dev
+        soxr-dev \
+        xxd
 
-##### ALAC #####
-RUN git clone https://github.com/mikebrady/alac
-WORKDIR /alac
-RUN autoreconf -i
-RUN ./configure
-RUN make -j $(nproc)
-RUN make install
-WORKDIR /
-##### ALAC END #####
-
-##### SPS #####
+ARG SHAIRPORT_SYNC_BRANCH
 WORKDIR /shairport-sync
 COPY . .
-RUN git checkout "$SHAIRPORT_SYNC_BRANCH"
+RUN rm -rf build
+# the above three lines or the following...
+# RUN git clone --depth=1 -b "SHAIRPORT_SYNC_BRANCH" https://github.com/mikebrady/sps-private shairport-sync
+
+COPY --from=ffmpeglite /ffmpeg_build/lib/ /usr/local/lib
+COPY --from=ffmpeglite /ffmpeg_build/lib/pkgconfig/*.pc  /usr/local/lib/pkgconfig/
+COPY --from=ffmpeglite /ffmpeg_build/include/  /usr/local/include
+
+# RUN git checkout "$SHAIRPORT_SYNC_BRANCH"
+# the following is to remove any build directory that might be there
+# not needed if the source is a clone of the repository
+# RUN rm -rf build
 WORKDIR /shairport-sync/build
 RUN autoreconf -i ../
-RUN CFLAGS="-O3" CXXFLAGS="-O3" ../configure --sysconfdir=/etc --with-alsa --with-pa --with-soxr --with-avahi --with-ssl=openssl \
-        --with-metadata --with-dummy --with-pipe --with-dbus-interface \
+RUN ../configure --sysconfdir=/etc --with-alsa --with-pulseaudio --with-soxr --with-avahi --with-ssl=openssl \
+        --with-ffmpeg --with-metadata --with-dummy --with-pipe --with-dbus-interface \
         --with-stdout --with-mpris-interface --with-mqtt-client \
-        --with-apple-alac --with-convolution
-RUN make -j $(nproc)
+        --with-convolution --with-pipewire
+RUN make
 RUN DESTDIR=install make install
 WORKDIR /
 ##### SPS END #####
 
+##### STATIC FILES #####
+FROM scratch AS files
+
+# Add run script that will start SPS
+COPY --chmod=755 ./docker/classic/run.sh ./run.sh
+COPY ./docker/etc/pulse /etc/pulse
+##### END STATIC FILES #####
+
+##### BUILD FILES #####
+FROM scratch AS build-files
+COPY --from=ffmpeglite /ffmpeg_build/lib/ /usr/local/lib
+COPY --from=shairport-sync /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync
+COPY --from=shairport-sync /shairport-sync/build/install/usr/local/share/man/man1 /usr/share/man/man1
+COPY --from=shairport-sync /shairport-sync/build/install/etc/shairport-sync.conf /etc/
+COPY --from=shairport-sync /shairport-sync/build/install/etc/shairport-sync.conf.sample /etc/
+COPY --from=shairport-sync /shairport-sync/build/install/etc/dbus-1/system.d/shairport-sync-dbus.conf /etc/dbus-1/system.d/
+COPY --from=shairport-sync /shairport-sync/build/install/etc/dbus-1/system.d/shairport-sync-mpris.conf /etc/dbus-1/system.d/
+##### END BUILD FILES #####
+
 # Shairport Sync Runtime System
-FROM crazymax/alpine-s6:3.20-3.2.0.2
+FROM alpine:$ALPINE_VERSION
 
-ENV S6_CMD_WAIT_FOR_SERVICES=1
-ENV S6_CMD_WAIT_FOR_SERVICES_MAXTIME=0
+COPY --from=build-files / /
 
-RUN apk -U add \
+RUN apk --no-cache add \
         alsa-lib \
         avahi \
-        avahi-tools \
         dbus \
         glib \
-        less \
-        less-doc \
         libconfig \
-        libsndfile-dev \
+        pipewire \
         libpulse \
-        man-pages \
-        mandoc \
         libcrypto3 \
         mosquitto \
         popt \
         soxr \
-        curl
+        curl && \
+        rm -rfv /lib/apk/db/* && \
+        rm -rfv /etc/avahi/services/*.service && \
+        rm -rf /usr/share/man && \
+        addgroup shairport-sync && \
+        adduser -D shairport-sync -G shairport-sync && \
+        addgroup -g 29 docker_audio && \
+        addgroup shairport-sync docker_audio && \
+        addgroup shairport-sync audio && \
+        mkdir -p /run/dbus
 
-# Copy build files.
-COPY --from=builder /shairport-sync/build/install/usr/local/bin/shairport-sync /usr/local/bin/shairport-sync
-COPY --from=builder /shairport-sync/build/install/usr/local/share/man/man1 /usr/share/man/man1
-COPY --from=builder /usr/local/lib/libalac.* /usr/local/lib/
-COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf /etc/
-COPY --from=builder /shairport-sync/build/install/etc/shairport-sync.conf.sample /etc/
-COPY --from=builder /shairport-sync/build/install/etc/dbus-1/system.d/shairport-sync-dbus.conf /etc/dbus-1/system.d/
-COPY --from=builder /shairport-sync/build/install/etc/dbus-1/system.d/shairport-sync-mpris.conf /etc/dbus-1/system.d/
+# Removed anything we don't need.
+# Removed any statically-defined Avahi services, e.g. SSH and SFTP
 
-COPY ./docker/classic/etc/s6-overlay/s6-rc.d /etc/s6-overlay/s6-rc.d
-RUN chmod +x /etc/s6-overlay/s6-rc.d/01-startup/script.sh
-
-# Create non-root user for running the container -- running as the user 'shairport-sync' also allows
+# Created non-root user for running the container -- running as the user 'shairport-sync' also allows
 # Shairport Sync to provide the D-Bus and MPRIS interfaces within the container
+# Added the shairport-sync user to the pre-existing audio group, which has ID 29, for access to the ALSA stuff
 
-RUN addgroup shairport-sync
-RUN adduser -D shairport-sync -G shairport-sync
-
-# Add the shairport-sync user to the pre-existing audio group, which has ID 29, for access to the ALSA stuff
-RUN addgroup -g 29 docker_audio && addgroup shairport-sync docker_audio && addgroup shairport-sync audio
-
-# Remove anything we don't need.
-RUN rm -rf /lib/apk/db/*
-
-# Remove any statically-defined Avahi services, e.g. SSH and SFTP
-RUN rm -rf /etc/avahi/services/*.service
-
-# Add run script that will start SPS
-COPY ./docker/run.sh ./run.sh
-RUN chmod +x /run.sh
-
-# D-Bus might need this directory
-RUN mkdir -p /run/dbus
-
-ENTRYPOINT ["/init","./run.sh"]
+COPY --from=files / /
+ENV ENABLE_AVAHI=1
+ENTRYPOINT ["./run.sh"]

docker/classic/etc/s6-overlay/s6-rc.d/01-startup/dependencies

@@ -1 +0,0 @@
-base

docker/classic/etc/s6-overlay/s6-rc.d/01-startup/script.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "STARTING - $(date)"

docker/classic/etc/s6-overlay/s6-rc.d/01-startup/type

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

docker/classic/etc/s6-overlay/s6-rc.d/01-startup/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/01-startup/script.sh

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/data/check

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec dbus-send --system / org.freedesktop.DBus.Peer.Ping > /dev/null 2> /dev/null

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/dependencies

@@ -1 +0,0 @@
-01-startup

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/finish

@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd

@@ -1 +0,0 @@
-3

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/run

@@ -1,7 +0,0 @@
-#!/command/with-contenv sh
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576
-
-echo "Starting dbus"
-exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile

docker/classic/etc/s6-overlay/s6-rc.d/02-dbus/type

@@ -1 +0,0 @@
-longrun

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/data/check

@@ -1,10 +0,0 @@
-#!/bin/sh
-state="$(dbus-send --system --dest=org.freedesktop.Avahi --print-reply / org.freedesktop.Avahi.Server.GetState | grep int32 | awk '{printf $2}')"
-
-# Avahi will return 'state=2' when 'Server startup complete'
-if [ "$state" = 2 ]; then
-    exit 0
-else
-    exit 1
-fi
-

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/dependencies

@@ -1 +0,0 @@
-02-dbus

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/finish

@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd

@@ -1 +0,0 @@
-3

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/run

@@ -1,3 +0,0 @@
-#!/command/with-contenv sh
-echo "Starting avahi"
-exec s6-notifyoncheck avahi-daemon --no-chroot

docker/classic/etc/s6-overlay/s6-rc.d/03-avahi/type

@@ -1 +0,0 @@
-longrun

docker/classic/run.sh

@@ -1,8 +1,32 @@
 #!/bin/sh
+
+# exist if any command returns a non-zero result
+set -e
+
+echo "Shairport Sync Startup ($(date))"
+
+if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
+  rm -rf /run/dbus/dbus.pid
+  rm -rf /run/avahi-daemon/pid
+
+  dbus-uuidgen --ensure
+  dbus-daemon --system
+
+  avahi-daemon --daemonize --no-chroot
+fi
+
 while [ ! -f /var/run/avahi-daemon/pid ]; do
-  echo "Warning: avahi is not running, sleeping for 1 second before trying to start shairport-sync"
-  sleep 1
+  echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
+  sleep 5
 done
-echo "Starting shairport-sync"
-# pass all commandline options to shairport-sync
-/usr/local/bin/shairport-sync "$@"
+
+# for PipeWire
+export XDG_RUNTIME_DIR=/tmp
+
+# for PulseAudio
+export PULSE_SERVER=unix:/tmp/pulseaudio.socket
+export PULSE_COOKIE=/tmp/pulseaudio.cookie
+
+echo "Finished startup tasks ($(date)), starting Shairport Sync."
+
+exec /usr/local/bin/shairport-sync "$@"

docker/docker-compose.yaml

@@ -3,19 +3,21 @@
 services:
   shairport-sync:
     image: mikebrady/shairport-sync:latest
-    network_mode: host
+    network_mode: host  # Required for AirPlay 2
     restart: unless-stopped
     # environment:
-    #  S6_KEEP_ENV: 1 # Allow S6 to pass environment variables from compose file
     #  PULSE_SERVER: unix:/tmp/pulseaudio.socket # Path for PulseAudio socket
     #  PULSE_COOKIE: /tmp/pulseaudio.cookie # Path for PulseAudio cookie
     #  XDG_RUNTIME_DIR: /tmp # Path for pipewire
+    #  ENABLE_AVAHI: 0 # Disable DBus and Avahi daemon inside the container
     devices:
       - "/dev/snd" # ALSA device, omit if using PulseAudio
     # volumes:
     #   - ./volumes/shairport-sync/shairport-sync.conf:/etc/shairport-sync.conf # Customised Shairport Sync configuration file.
     #   - /run/user/1000/pulse/native:/tmp/pulseaudio.socket # PulseAudio socket when using that backend
     #   - /run/user/1000/pipewire-0:/tmp/pipewire-0 # Pipewire socket when using pipewire
+    #   - /var/run/dbus:/var/run/dbus # DBus when ENABLE_AVAHI set to 0
+    #   - /var/run/avahi-daemon:/var/run/avahi-daemon # Avahi socket when ENABLE_AVAHI set to 0
     # command: -o pw # You can specify the desired output with command:
     logging:
       options:

docker/etc/s6-overlay/s6-rc.d/01-startup/dependencies

@@ -1 +0,0 @@
-base

docker/etc/s6-overlay/s6-rc.d/01-startup/script.sh

@@ -1,2 +0,0 @@
-#!/bin/sh
-echo "STARTING - $(date)"

docker/etc/s6-overlay/s6-rc.d/01-startup/type

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

docker/etc/s6-overlay/s6-rc.d/01-startup/up

@@ -1 +0,0 @@
-/etc/s6-overlay/s6-rc.d/01-startup/script.sh

docker/etc/s6-overlay/s6-rc.d/02-dbus/data/check

@@ -1,2 +0,0 @@
-#!/bin/sh
-exec dbus-send --system / org.freedesktop.DBus.Peer.Ping > /dev/null 2> /dev/null

docker/etc/s6-overlay/s6-rc.d/02-dbus/dependencies

@@ -1 +0,0 @@
-01-startup

docker/etc/s6-overlay/s6-rc.d/02-dbus/finish

@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt

docker/etc/s6-overlay/s6-rc.d/02-dbus/notification-fd

@@ -1 +0,0 @@
-3

docker/etc/s6-overlay/s6-rc.d/02-dbus/run

@@ -1,7 +0,0 @@
-#!/command/with-contenv sh
-
-# Set the limit to the same value Docker has been using in earlier version.
-ulimit -n 1048576
-
-echo "Starting dbus"
-exec s6-notifyoncheck  dbus-daemon --system --nofork --nopidfile

docker/etc/s6-overlay/s6-rc.d/02-dbus/type

@@ -1 +0,0 @@
-longrun

docker/etc/s6-overlay/s6-rc.d/03-avahi/data/check

@@ -1,10 +0,0 @@
-#!/bin/sh
-state="$(dbus-send --system --dest=org.freedesktop.Avahi --print-reply / org.freedesktop.Avahi.Server.GetState | grep int32 | awk '{printf $2}')"
-
-# Avahi will return 'state=2' when 'Server startup complete'
-if [ "$state" = 2 ]; then
-    exit 0
-else
-    exit 1
-fi
-

docker/etc/s6-overlay/s6-rc.d/03-avahi/dependencies

@@ -1 +0,0 @@
-02-dbus

docker/etc/s6-overlay/s6-rc.d/03-avahi/finish

@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt

docker/etc/s6-overlay/s6-rc.d/03-avahi/notification-fd

@@ -1 +0,0 @@
-3

docker/etc/s6-overlay/s6-rc.d/03-avahi/run

@@ -1,3 +0,0 @@
-#!/command/with-contenv sh
-echo "Starting avahi"
-exec s6-notifyoncheck avahi-daemon --no-chroot

docker/etc/s6-overlay/s6-rc.d/03-avahi/type

@@ -1 +0,0 @@
-longrun

docker/etc/s6-overlay/s6-rc.d/04-nqptp/dependencies

@@ -1 +0,0 @@
-01-startup

docker/etc/s6-overlay/s6-rc.d/04-nqptp/finish

@@ -1,2 +0,0 @@
-#!/command/execlineb -S0
-/run/s6/basedir/bin/halt

docker/etc/s6-overlay/s6-rc.d/04-nqptp/run

@@ -1,3 +0,0 @@
-#!/command/with-contenv sh
-echo "Starting nqptp"
-exec /usr/local/bin/nqptp

docker/etc/s6-overlay/s6-rc.d/04-nqptp/type

@@ -1 +0,0 @@
-longrun

docker/run.sh

@@ -1,8 +1,36 @@
 #!/bin/sh
+
+# exist if any command returns a non-zero result
+set -e
+
+echo "Shairport Sync Startup ($(date))"
+
+if [ -z ${ENABLE_AVAHI+x} ] || [ $ENABLE_AVAHI -eq 1 ]; then
+  rm -rf /run/dbus/dbus.pid
+  rm -rf /run/avahi-daemon/pid
+
+  dbus-uuidgen --ensure
+  dbus-daemon --system
+
+  avahi-daemon --daemonize --no-chroot
+fi
+
+echo "Starting NQPTP ($(date))"
+
+(/usr/local/bin/nqptp > /dev/null 2>&1) &
+
 while [ ! -f /var/run/avahi-daemon/pid ]; do
-  echo "Warning: avahi is not running, sleeping for 1 second before trying to start shairport-sync"
-  sleep 1
+  echo "Warning: avahi is not running, sleeping for 5 seconds before trying to start shairport-sync"
+  sleep 5
 done
-echo "Starting shairport-sync"
-# pass all commandline options to shairport-sync
-/usr/local/bin/shairport-sync "$@"
+
+# for PipeWire
+export XDG_RUNTIME_DIR=/tmp
+
+# for PulseAudio
+export PULSE_SERVER=unix:/tmp/pulseaudio.socket
+export PULSE_COOKIE=/tmp/pulseaudio.cookie
+
+echo "Finished startup tasks ($(date)), starting Shairport Sync."
+
+exec /usr/local/bin/shairport-sync "$@"