Fix Consul --retry-join failure (autopilotpattern#73)

tgross · web-flow · commit 62878e01fa91 · 2016-12-09T10:25:25.000-05:00
* Never leave LOG_LEVEL unset in Compose file

* single-node Consul server should not use ContainerPilot

* Don't include port in --retry-join field when we rewrite CP config
diff --git a/bin/manager/containerpilot.py b/bin/manager/containerpilot.py
@@ -36,16 +36,15 @@ def load(self, envs=os.environ):
         cfg = cfg.replace('}{{ end }}', '}')
         config = json.loads(cfg)
 
-        consul = env('CONSUL', 'consul', envs, fn='{}:8500'.format)
-
         if env('CONSUL_AGENT', False, envs, to_flag):
             config['consul'] = 'localhost:8500'
             cmd = config['coprocesses'][0]['command']
             host_cfg_idx = cmd.index('-retry-join') + 1
-            cmd[host_cfg_idx] = consul
+            cmd[host_cfg_idx] = env('CONSUL', 'consul', envs)
             config['coprocesses'][0]['command'] = cmd
         else:
-            config['consul'] = consul
+            config['consul'] = env('CONSUL', 'consul', envs,
+                                   fn='{}:8500'.format)
             config['coprocesses'] = []
 
         self.config = config
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -12,16 +12,12 @@ mysql:
     environment:
       - CONTAINERPILOT=file:///etc/containerpilot.json
       - CONSUL_AGENT=1
-      - LOG_LEVEL
+      - LOG_LEVEL=INFO
 
 consul:
-    image: autopilotpattern/consul:0.7r0.7
-    command: >-
-      /usr/local/bin/containerpilot
-      /bin/consul agent -server
-        -bootstrap-expect 1
-        -config-dir=/etc/consul
-        -ui-dir /ui
+    image: consul:0.7.1
+    command: >
+      agent -server -client=0.0.0.0 -bootstrap -ui
     restart: always
     mem_limit: 128m
     ports:
