From: nipsufn <nipsufn+gh@pm.me>
Date: Sun, 2 Apr 2023 13:22:27 +0000 (+0200)
Subject: fix: adjust to follow nqptp
X-Git-Tag: 4.2.1d0~8^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1642%2Fhead;p=thirdparty%2Fshairport-sync.git

fix: adjust to follow nqptp
---

diff --git a/docker/README.md b/docker/README.md
index 02a57cd3..6caf1c4d 100644
--- a/docker/README.md
+++ b/docker/README.md
@@ -46,16 +46,6 @@ The image is built with PulseAudio backend support. To use it, refer to [`docker
 
 To get access to the full range of configuration options, pass the configuration file to `/etc/shairport-sync.conf` in the container using the `-v` option or docker compose.
 
-## Environment variables
-
-Set `IPV4ONLY` to any value to force NQPTP to use IPv4 (might be useful on hosts not running IPv6):
-
-```
-$ docker run --env IPV4ONLY=yes -d --restart unless-stopped --net host --device /dev/snd \
-    mikebrady/shairport-sync:latest \
-    -v --statistics -a DenSystem -d hw:0 -c PCM
-```
-
 ## Building
 ### Build Example (for arm7 devices)
 
diff --git a/docker/docker-compose.yaml b/docker/docker-compose.yaml
index c6cb8330..563622d6 100644
--- a/docker/docker-compose.yaml
+++ b/docker/docker-compose.yaml
@@ -8,7 +8,6 @@ services:
     # environment:
     #  PULSE_SERVER: unix:/tmp/pulseaudio.socket # Path for PulseAudio socket
     #  PULSE_COOKIE: /tmp/pulseaudio.cookie # Path for PulseAudio cookie
-    #  IPV4ONLY: "yes" # Force IPv4 in nqptp
     devices:
       - "/dev/snd" # ALSA device
     # volumes:
diff --git a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run
index 7ac01716..27a489b8 100644
--- a/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run
+++ b/docker/etc/s6-overlay/s6-rc.d/04-nqptp/run
@@ -1,7 +1,3 @@
 #!/command/with-contenv sh
 echo "Starting nqptp"
-if [ -z ${IPV4ONLY+x} ]; then
-    exec /usr/local/bin/nqptp
-else
-    exec /usr/local/bin/nqptp -ipv4-only
-fi
+exec /usr/local/bin/nqptp