Merge pull request #872 from deis/remove-containers-on-start

fix(systemd): handle app containers on restarts

Author: Matthew Fisher

controller/scheduler/coreos.py

@@ -195,11 +195,10 @@ def attach(self, name):
 CONTAINER_TEMPLATE = """
 [Unit]
 Description={name}
-After=docker.service
-Requires=docker.service
 
 [Service]
 ExecStartPre=/usr/bin/docker pull {image}
+ExecStartPre=/bin/sh -c "docker inspect {name} >/dev/null 2>&1 && docker rm -f {name} || true"
 ExecStart=-/usr/bin/docker run --name {name} -P -e PORT={port} {image} {command}
 ExecStartPost=-/bin/sh -c "until docker inspect {name} >/dev/null 2>&1; do sleep 1; done"; \
     -/bin/sh -c "arping -Idocker0 -c1 `docker inspect -f '{{{{ .NetworkSettings.IPAddress }}}}' {name}`"