From: Mike Brady <4265913+mikebrady@users.noreply.github.com> Date: Mon, 24 Oct 2022 08:48:10 +0000 (+0100) Subject: formatting and small updates X-Git-Tag: 4.1-rc4~3^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=5e874320eeacb22df2cc8dd0dc64a09deb963ba6;p=thirdparty%2Fshairport-sync.git formatting and small updates --- diff --git a/docker/README.md b/docker/README.md index 8c31a84d..648996cb 100644 --- a/docker/README.md +++ b/docker/README.md @@ -2,21 +2,26 @@ Available at: https://hub.docker.com/r/mikebrady/shairport-sync -Please note if you want the development version of the image including Airplay 2 support, please pull the image with the `development` tag using the following command: -``` -docker pull mikebrady/shairport-sync:development -``` +Versions with tags including `-classic` provide classic AirPlay, the same as Shairport Sync versions up to 3.3.9. -When using the below commands, you should replace `mikebrady/shairport-sync` with `mikbrady/shairport-sync:development`. +(**Note:** At this time, `stable` tags may not be available.) ## Example Docker Compose File See the `docker-compose.yaml` file in this folder for an example. ## Docker Run +To run the latest stable release of Shairport Sync, which provides AirPlay 2 service: + +``` +$ docker run -d --restart unless-stopped --net host --device /dev/snd \ + mikebrady/shairport-sync:stable +``` +To run the classic version: + ``` $ docker run -d --restart unless-stopped --net host --device /dev/snd \ - mikebrady/shairport-sync + mikebrady/shairport-sync:stable-classic ``` ### Options @@ -24,7 +29,7 @@ $ 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 \ - mikebrady/shairport-sync:development \ + mikebrady/shairport-sync:stable \ -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. @@ -37,7 +42,7 @@ To get access to the full range of configuration options, pass the configuration ### Build Example (for arm7 devices) ``` -docker buildx build --platform linux/arm/v7 -f ./docker/Dockerfile --build-arg SHAIRPORT_SYNC_BRANCH=development --build-arg NQPTP_BRANCH=development --no-cache -t shairport-sync:unstable-development . +docker buildx build --platform linux/arm/v7 -f ./docker/Dockerfile --build-arg SHAIRPORT_SYNC_BRANCH=development --build-arg NQPTP_BRANCH=development --no-cache -t shairport-sync:development . ``` `SHAIRPORT_SYNC_BRANCH` and `NQPTP_BRANCH` are required to ensure the image is built using the expected branch. diff --git a/docker/classic/README.md b/docker/classic/README.md index 4dd3bf76..9bbf51e6 100644 --- a/docker/classic/README.md +++ b/docker/classic/README.md @@ -1,3 +1,3 @@ -# Classic (AirPlay 1 Only) Docker Image +# Classic (aka AirPlay 1 Only) Docker Image See the [Shairport Sync Docker Hub Repo](https://hub.docker.com/r/mikebrady/shairport-sync) for available tags. diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish index a8222fb0..e4a13866 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish +++ b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/finish @@ -1,2 +1,2 @@ #!/command/execlineb -S0 -/run/s6/basedir/bin/halt \ No newline at end of file +/run/s6/basedir/bin/halt diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run index 8757e5d5..bf1cb501 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run +++ b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/run @@ -1,4 +1,4 @@ #!/command/with-contenv sh rm -rf /var/run/dbus.pid echo "Starting dbus" -exec dbus-daemon --system --nofork \ No newline at end of file +exec dbus-daemon --system --nofork diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type index 1780f9f4..5883cff0 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type +++ b/docker/classic/etc/s6-overlay/s6-rc.d/01-dbus/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish index a8222fb0..e4a13866 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish +++ b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/finish @@ -1,2 +1,2 @@ #!/command/execlineb -S0 -/run/s6/basedir/bin/halt \ No newline at end of file +/run/s6/basedir/bin/halt diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run index fc509297..2f6be7b4 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run +++ b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/run @@ -5,4 +5,4 @@ while [ ! -f /var/run/dbus.pid ]; do sleep 5 done echo "Starting avahi" -exec avahi-daemon --no-chroot \ No newline at end of file +exec avahi-daemon --no-chroot diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type index 1780f9f4..5883cff0 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type +++ b/docker/classic/etc/s6-overlay/s6-rc.d/02-avahi/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh b/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh index c975a403..3037e98a 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh +++ b/docker/classic/etc/s6-overlay/s6-rc.d/startup/script.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo "STARTING - $(date)" \ No newline at end of file +echo "STARTING - $(date)" diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/type b/docker/classic/etc/s6-overlay/s6-rc.d/startup/type index 3d92b15f..bdd22a18 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/type +++ b/docker/classic/etc/s6-overlay/s6-rc.d/startup/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/docker/classic/etc/s6-overlay/s6-rc.d/startup/up b/docker/classic/etc/s6-overlay/s6-rc.d/startup/up index 0c609ec6..06df8350 100644 --- a/docker/classic/etc/s6-overlay/s6-rc.d/startup/up +++ b/docker/classic/etc/s6-overlay/s6-rc.d/startup/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/startup/script.sh \ No newline at end of file +/etc/s6-overlay/s6-rc.d/startup/script.sh diff --git a/docker/classic/start.sh b/docker/classic/start.sh index 5e24ff59..23b41efb 100644 --- a/docker/classic/start.sh +++ b/docker/classic/start.sh @@ -10,4 +10,4 @@ dbus-daemon --system avahi-daemon --daemonize --no-chroot -su-exec shairport-sync shairport-sync "$@" \ No newline at end of file +su-exec shairport-sync shairport-sync "$@" diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml index 1bd66168..5867d7ba 100644 --- a/docker/docker-compose.yaml +++ b/docker/docker-compose.yaml @@ -2,7 +2,7 @@ services: shairport-sync: - image: mikebrady/shairport-sync:development + image: mikebrady/shairport-sync:stable network_mode: host restart: unless-stopped devices: @@ -12,4 +12,4 @@ services: logging: options: max-size: "200k" - max-file: "10" \ No newline at end of file + max-file: "10" diff --git a/docker/etc/s6-overlay/s6-rc.d/01-dbus/finish b/docker/etc/s6-overlay/s6-rc.d/01-dbus/finish index a8222fb0..e4a13866 100644 --- a/docker/etc/s6-overlay/s6-rc.d/01-dbus/finish +++ b/docker/etc/s6-overlay/s6-rc.d/01-dbus/finish @@ -1,2 +1,2 @@ #!/command/execlineb -S0 -/run/s6/basedir/bin/halt \ No newline at end of file +/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/01-dbus/run b/docker/etc/s6-overlay/s6-rc.d/01-dbus/run index 8757e5d5..bf1cb501 100644 --- a/docker/etc/s6-overlay/s6-rc.d/01-dbus/run +++ b/docker/etc/s6-overlay/s6-rc.d/01-dbus/run @@ -1,4 +1,4 @@ #!/command/with-contenv sh rm -rf /var/run/dbus.pid echo "Starting dbus" -exec dbus-daemon --system --nofork \ No newline at end of file +exec dbus-daemon --system --nofork diff --git a/docker/etc/s6-overlay/s6-rc.d/01-dbus/type b/docker/etc/s6-overlay/s6-rc.d/01-dbus/type index 1780f9f4..5883cff0 100644 --- a/docker/etc/s6-overlay/s6-rc.d/01-dbus/type +++ b/docker/etc/s6-overlay/s6-rc.d/01-dbus/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/02-avahi/finish b/docker/etc/s6-overlay/s6-rc.d/02-avahi/finish index a8222fb0..e4a13866 100644 --- a/docker/etc/s6-overlay/s6-rc.d/02-avahi/finish +++ b/docker/etc/s6-overlay/s6-rc.d/02-avahi/finish @@ -1,2 +1,2 @@ #!/command/execlineb -S0 -/run/s6/basedir/bin/halt \ No newline at end of file +/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/02-avahi/run b/docker/etc/s6-overlay/s6-rc.d/02-avahi/run index fc509297..2f6be7b4 100644 --- a/docker/etc/s6-overlay/s6-rc.d/02-avahi/run +++ b/docker/etc/s6-overlay/s6-rc.d/02-avahi/run @@ -5,4 +5,4 @@ while [ ! -f /var/run/dbus.pid ]; do sleep 5 done echo "Starting avahi" -exec avahi-daemon --no-chroot \ No newline at end of file +exec avahi-daemon --no-chroot diff --git a/docker/etc/s6-overlay/s6-rc.d/02-avahi/type b/docker/etc/s6-overlay/s6-rc.d/02-avahi/type index 1780f9f4..5883cff0 100644 --- a/docker/etc/s6-overlay/s6-rc.d/02-avahi/type +++ b/docker/etc/s6-overlay/s6-rc.d/02-avahi/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/finish b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/finish index a8222fb0..e4a13866 100644 --- a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/finish +++ b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/finish @@ -1,2 +1,2 @@ #!/command/execlineb -S0 -/run/s6/basedir/bin/halt \ No newline at end of file +/run/s6/basedir/bin/halt diff --git a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/run b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/run index e8b59b2e..27a489b8 100644 --- a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/run +++ b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/run @@ -1,3 +1,3 @@ #!/command/with-contenv sh echo "Starting nqptp" -exec /usr/local/bin/nqptp \ No newline at end of file +exec /usr/local/bin/nqptp diff --git a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/type b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/type index 1780f9f4..5883cff0 100644 --- a/docker/etc/s6-overlay/s6-rc.d/03-nqptp/type +++ b/docker/etc/s6-overlay/s6-rc.d/03-nqptp/type @@ -1 +1 @@ -longrun \ No newline at end of file +longrun diff --git a/docker/etc/s6-overlay/s6-rc.d/startup/script.sh b/docker/etc/s6-overlay/s6-rc.d/startup/script.sh index c975a403..3037e98a 100644 --- a/docker/etc/s6-overlay/s6-rc.d/startup/script.sh +++ b/docker/etc/s6-overlay/s6-rc.d/startup/script.sh @@ -1,2 +1,2 @@ #!/bin/sh -echo "STARTING - $(date)" \ No newline at end of file +echo "STARTING - $(date)" diff --git a/docker/etc/s6-overlay/s6-rc.d/startup/type b/docker/etc/s6-overlay/s6-rc.d/startup/type index 3d92b15f..bdd22a18 100644 --- a/docker/etc/s6-overlay/s6-rc.d/startup/type +++ b/docker/etc/s6-overlay/s6-rc.d/startup/type @@ -1 +1 @@ -oneshot \ No newline at end of file +oneshot diff --git a/docker/etc/s6-overlay/s6-rc.d/startup/up b/docker/etc/s6-overlay/s6-rc.d/startup/up index 0c609ec6..06df8350 100644 --- a/docker/etc/s6-overlay/s6-rc.d/startup/up +++ b/docker/etc/s6-overlay/s6-rc.d/startup/up @@ -1 +1 @@ -/etc/s6-overlay/s6-rc.d/startup/script.sh \ No newline at end of file +/etc/s6-overlay/s6-rc.d/startup/script.sh