From 2414cdd3f07422ce8076e328eef235c3c69e0927 Mon Sep 17 00:00:00 2001 From: pierreozoux <pierre@ozoux.net> Date: Sun, 6 Sep 2015 13:18:17 +0100 Subject: [PATCH] Fixes discovery --- unit-files/discovery-u@.service | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/unit-files/discovery-u@.service b/unit-files/discovery-u@.service index 66deca1..62b24e2 100644 --- a/unit-files/discovery-u@.service +++ b/unit-files/discovery-u@.service @@ -11,10 +11,14 @@ BindsTo=universal@%i.service Type=oneshot RemainAfterExit=yes Environment=URL=%i -ExecStart=/bin/bash -euxc ' \ - sleep 3; \ - container_name=`echo ${URL}_web_1 | sed "s/\.//g" | sed "s/-//g"`; \ - ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $container_name`; \ +ExecStart=/bin/bash -xc ' \ + ip=""; \ + while [ -z $ip ]; \ + do \ + container_name=`echo ${URL}_web_1 | sed "s/\.//g" | sed "s/-//g"`; \ + ip=`docker inspect --format \'{{.NetworkSettings.IPAddress}}\' $container_name`; \ + sleep 1; \ + done; \ etcdctl --peers 172.17.42.1:4001 set /services/web/%i \'{"ip":"\'$ip\'", "port":"80"}\';' ExecStop=-/usr/bin/etcdctl rm /services/web/%i -- GitLab