From 073e963e3fce657b894f31ce3c16fe05a6139375 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Wed, 3 Jan 2018 16:52:52 +0100 Subject: [PATCH] Switch to using docker run --rm and stop Signed-off-by: Patrick Uiterwijk --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index abf4330f06..18bb7f3c25 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -5,11 +5,11 @@ Requires=docker.service [Service] TimeoutStartSec=0 -Type=oneshot +mype=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 -TimeoutStopSec=180 +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=30 [Install] WantedBy=multi-user.target