From aa83920d8a0e3a05d7f0ff647301c59930267d8e Mon Sep 17 00:00:00 2001
From: pierreozoux <pierre@ozoux.net>
Date: Wed, 14 Jan 2015 14:48:24 +0100
Subject: [PATCH] Adds rm arg to docker run

---
 unit-files/confd.service           | 1 +
 unit-files/email-forwarder.service | 1 +
 unit-files/haproxy.service         | 1 +
 unit-files/mysql@.service          | 1 +
 4 files changed, 4 insertions(+)

diff --git a/unit-files/confd.service b/unit-files/confd.service
index d02f300..5afe2cb 100644
--- a/unit-files/confd.service
+++ b/unit-files/confd.service
@@ -15,6 +15,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/haproxy/:/etc/haproxy/ \
   -v /var/run/docker.sock:/var/run/docker.sock \
diff --git a/unit-files/email-forwarder.service b/unit-files/email-forwarder.service
index b0bf3d3..715e7f8 100644
--- a/unit-files/email-forwarder.service
+++ b/unit-files/email-forwarder.service
@@ -12,6 +12,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/postfix/:/data \
   -p 25:25 \
diff --git a/unit-files/haproxy.service b/unit-files/haproxy.service
index 3ffdd9f..57d2d8e 100644
--- a/unit-files/haproxy.service
+++ b/unit-files/haproxy.service
@@ -12,6 +12,7 @@ Restart=always
 ExecStartPre=-/usr/bin/docker kill %p
 ExecStartPre=-/usr/bin/docker rm %p
 ExecStart=/usr/bin/docker run \
+  --rm \
   --name %p \
   -v /data/runtime/haproxy:/etc/haproxy \
   -p 80:80 \
diff --git a/unit-files/mysql@.service b/unit-files/mysql@.service
index 6a39d9f..25ab989 100644
--- a/unit-files/mysql@.service
+++ b/unit-files/mysql@.service
@@ -33,6 +33,7 @@ ExecStartPre=/bin/bash -euxc ' \
   fi'
 
 ExecStart=/opt/bin/systemd-docker run \
+  --rm \
   --name %p-%i \
   -v /data/runtime/domains/%i/%p/db_files:/var/lib/mysql \
   -e STARTUP_SQL=/var/lib/mysql/dump.sql \
-- 
GitLab