From a408629158516bc0c07048170156a124f599d319 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Thu, 23 Nov 2017 20:29:19 +0000 Subject: [PATCH] Remove the mirrorlist container on removal Signed-off-by: Patrick Uiterwijk --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index abf4330f06..01de7bba6f 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -7,8 +7,8 @@ Requires=docker.service TimeoutStartSec=0 Type=oneshot RemainAfterExit=yes -ExecStart=/usr/bin/docker run --detach --log-driver none --name %n -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 1808{{ item }}:80 {{ mirrorlist_container_image }} -l /var/log/mirrormanager/%n.log -ExecStop=/usr/bin/docker rm --force %n +ExecStart=/usr/bin/docker run --rm --detach --log-driver none --name %n -v /srv/mirrorlist/data/mirrorlist{{ item }}:/var/lib/mirrormanager:z -v /var/log/mirrormanager:/var/log/mirrormanager:z -p 1808{{ item }}:80 {{ mirrorlist_container_image }} -l /var/log/mirrormanager/%n.log +ExecStop=/usr/bin/docker stop %n TimeoutStopSec=180 [Install]