From f54e8493e70f1b2bb6bdd6d2a5e67bea5e98c895 Mon Sep 17 00:00:00 2001 From: Patrick Uiterwijk Date: Sat, 6 Jan 2018 00:51:57 +0000 Subject: [PATCH] Until signal processing gets fixed for mirrorlist, hack around it Signed-off-by: Patrick Uiterwijk --- .../mirrorlist_proxy/templates/mirrorlist.service.j2 | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 index 7c54acbd33..470fd9844c 100644 --- a/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 +++ b/roles/mirrormanager/mirrorlist_proxy/templates/mirrorlist.service.j2 @@ -8,7 +8,9 @@ TimeoutStartSec=0 Type=oneshot RemainAfterExit=yes 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 --time=180 %n +ExecStop=/usr/bin/docker stop --time=1 %n +# Mirrorlist can't take a signal... but docker stop returns before it actually killed everything. +ExecStop=/usr/bin/sleep 10 TimeoutStopSec=180 [Install]