formatting and small updates

diff --git a/docker/README.md b/docker/README.md
index 8c31a84d0fde92aa9dd0fb238c34d6868131189e..648996cb869388adcec0e06b30243c51a59bd563 100644 (file)
--- 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 4dd3bf76414ea86cabe0521ccfdf2c81b1612e87..9bbf51e6f2981529f1b1551eeaa3facb5aa74d54 100644 (file)
--- 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 a8222fb032b87e95aba406340855ff02cb836e12..e4a13866b1bd8cae5fca897e7a1158845ac69b4e 100644 (file)
--- 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 8757e5d50cf22ac34ca5e247c133d00bddf973b6..bf1cb501b402bfa5df352cde7f9664a18ff37751 100644 (file)
--- 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 1780f9f44efd7a9a5240468e2d3d851ae5b7a471..5883cff0cd1514b2836f4ffa39fdac769a5213cb 100644 (file)
--- 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 a8222fb032b87e95aba406340855ff02cb836e12..e4a13866b1bd8cae5fca897e7a1158845ac69b4e 100644 (file)
--- 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 fc50929702623986c75729953255bba66593b4d7..2f6be7b40d9fc9785ea52908f0ffd3c92a72efe4 100644 (file)
--- 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 1780f9f44efd7a9a5240468e2d3d851ae5b7a471..5883cff0cd1514b2836f4ffa39fdac769a5213cb 100644 (file)
--- 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 c975a4036b3aef1617c037b41fc98a1cffb6ee92..3037e98ad2910beacec23c4adf26bead52b96030 100644 (file)
--- 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 3d92b15f2d56c7753feb51fd035d8c490de86bd7..bdd22a1850ae6c03a414eeb8084998679a2cdf92 100644 (file)
--- 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 0c609ec60a80501b2112b6b816c2dfbb85da652e..06df835099cf002967a8d72753e79b5b5d79e5df 100644 (file)
--- 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 5e24ff596ce871a251c76f17a975b2fdc4725166..23b41efb9839c4b265eaacfda9b14d270ffbf9e6 100644 (file)
--- 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 1bd66168b3f3c3eb630e2f4e070d482e89e2b6d0..5867d7baf7b88ddd87bcd0db93b526121d4c8878 100644 (file)
--- 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 a8222fb032b87e95aba406340855ff02cb836e12..e4a13866b1bd8cae5fca897e7a1158845ac69b4e 100644 (file)
--- 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 8757e5d50cf22ac34ca5e247c133d00bddf973b6..bf1cb501b402bfa5df352cde7f9664a18ff37751 100644 (file)
--- 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 1780f9f44efd7a9a5240468e2d3d851ae5b7a471..5883cff0cd1514b2836f4ffa39fdac769a5213cb 100644 (file)
--- 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 a8222fb032b87e95aba406340855ff02cb836e12..e4a13866b1bd8cae5fca897e7a1158845ac69b4e 100644 (file)
--- 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 fc50929702623986c75729953255bba66593b4d7..2f6be7b40d9fc9785ea52908f0ffd3c92a72efe4 100644 (file)
--- 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 1780f9f44efd7a9a5240468e2d3d851ae5b7a471..5883cff0cd1514b2836f4ffa39fdac769a5213cb 100644 (file)
--- 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 a8222fb032b87e95aba406340855ff02cb836e12..e4a13866b1bd8cae5fca897e7a1158845ac69b4e 100644 (file)
--- 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 e8b59b2e7afd2fd8a09a930f66d810c5f3123645..27a489b89363c034e73da837bec17ea6aacc15c8 100644 (file)
--- 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 1780f9f44efd7a9a5240468e2d3d851ae5b7a471..5883cff0cd1514b2836f4ffa39fdac769a5213cb 100644 (file)
--- 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 c975a4036b3aef1617c037b41fc98a1cffb6ee92..3037e98ad2910beacec23c4adf26bead52b96030 100644 (file)
--- 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 3d92b15f2d56c7753feb51fd035d8c490de86bd7..bdd22a1850ae6c03a414eeb8084998679a2cdf92 100644 (file)
--- 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 0c609ec60a80501b2112b6b816c2dfbb85da652e..06df835099cf002967a8d72753e79b5b5d79e5df 100644 (file)
--- 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