From fcc79806020bce1eca7d9e1b036ce4acf6bdc9d6 Mon Sep 17 00:00:00 2001
From: till <till@php.net>
Date: Sat, 30 May 2020 17:08:49 +0200
Subject: [PATCH] Fix: inspect services (vs. containers/tasks)

---
 assets/scripts/haproxy-reload.sh | 12 ++++++++----
 1 file changed, 8 insertions(+), 4 deletions(-)

diff --git a/assets/scripts/haproxy-reload.sh b/assets/scripts/haproxy-reload.sh
index df9f603..ecee161 100755
--- a/assets/scripts/haproxy-reload.sh
+++ b/assets/scripts/haproxy-reload.sh
@@ -18,14 +18,18 @@ else
     if [[ "$DISCOVER" == "docker" ]]; then
         CONTAINERS=$(docker ps -q)
         LABEL_PATH=".Config.Labels"
+
+        for container in ${CONTAINERS}; do
+            docker inspect --format "{{ json $LABEL_PATH }}" ${container} | xargs -I % echo ${container}=% >> ${CONTROL_FILE}
+        done
     else
         CONTAINERS=$(docker node ps $(docker node ls -q) --format "{{ .Name }}" --filter desired-state=running | cut -d. -f1 | sort | uniq)
         LABEL_PATH=".Spec.Labels"
-    fi
 
-    for container in ${CONTAINERS}; do
-        docker inspect --format "{{ json $LABEL_PATH }}" ${container} | xargs -I % echo ${container}=% >> ${CONTROL_FILE}
-    done
+        for container in ${CONTAINERS}; do
+            docker service inspect --format "{{ json $LABEL_PATH }}" ${container} | xargs -I % echo ${container}=% >> ${CONTROL_FILE}
+        done
+    fi
 
     if cmp -s ${CONTROL_FILE} ${CONTROL_FILE}.old ; then
         RELOAD="false"