From 1c143682c4ab0f2258a80db67aad524140576f60 Mon Sep 17 00:00:00 2001
From: SKP <skp@skp.rocks>
Date: Tue, 21 Jan 2020 15:22:41 +0100
Subject: [PATCH] Reliably get swarm nodeid of current host

---
 dist/setup.sh | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/dist/setup.sh b/dist/setup.sh
index 262fa92..1a9eaf9 100755
--- a/dist/setup.sh
+++ b/dist/setup.sh
@@ -545,34 +545,34 @@ install_docker() {
       next
     fi
 
-    local nodeid
-    nodeid=$(docker node ls -f role=manager --format="{{.ID}}")
+    local localnodeid
+    localnodeid=$(docker info -f '{{.Swarm.NodeID}}')
 
     # we only support swarm in single host mode, so all labels needed to spawn containers in the swarm
     # are given to the manager of the swarm
     # it is possible to move the io.cyphernode.apps label to a different node,
     # for apps which rely on shared volumes with core components, we have the io.cyphernode.clingyapps
-    if [[ $(docker node inspect ${nodeid} --format '{{ index .Spec.Labels "io.cyphernode.core" }}') == "true" ]]; then
+    if [[ $(docker node inspect ${localnodeid} --format '{{ index .Spec.Labels "io.cyphernode.core" }}') == "true" ]]; then
       step "      [32madd docker node label: io.cyphernode.core"
-      try docker node update --label-add io.cyphernode.core=true ${nodeid} > /dev/null 2>&1
+      try docker node update --label-add io.cyphernode.core=true ${localnodeid} > /dev/null 2>&1
       next
     fi
 
-    if [[ $(docker node inspect ${nodeid} --format '{{ index .Spec.Labels "io.cyphernode.infra" }}') == "true" ]]; then
+    if [[ $(docker node inspect ${localnodeid} --format '{{ index .Spec.Labels "io.cyphernode.infra" }}') == "true" ]]; then
       step "      [32madd docker node label: io.cyphernode.infra"
-      try docker node update --label-add io.cyphernode.infra=true ${nodeid} > /dev/null 2>&1
+      try docker node update --label-add io.cyphernode.infra=true ${localnodeid} > /dev/null 2>&1
       next
     fi
 
-    if [[ $(docker node inspect ${nodeid} --format '{{ index .Spec.Labels "io.cyphernode.apps" }}') == "true" ]]; then
+    if [[ $(docker node inspect ${localnodeid} --format '{{ index .Spec.Labels "io.cyphernode.apps" }}') == "true" ]]; then
       step "      [32madd docker node label: io.cyphernode.apps"
-      try docker node update --label-add io.cyphernode.apps=true ${nodeid} > /dev/null 2>&1
+      try docker node update --label-add io.cyphernode.apps=true ${localnodeid} > /dev/null 2>&1
       next
     fi
 
-    if [[ $(docker node inspect ${nodeid} --format '{{ index .Spec.Labels "io.cyphernode.clingyapps" }}') == "true" ]]; then
+    if [[ $(docker node inspect ${localnodeid} --format '{{ index .Spec.Labels "io.cyphernode.clingyapps" }}') == "true" ]]; then
       step "      [32madd docker node label: io.cyphernode.clingyapps"
-      try docker node update --label-add io.cyphernode.clingyapps=true ${nodeid} > /dev/null 2>&1
+      try docker node update --label-add io.cyphernode.clingyapps=true ${localnodeid} > /dev/null 2>&1
       next
     fi