From a35bf76154a9f18d3f6353db6aba054312bde568 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Andr=C3=A9?= <andre.peters@debinux.de>
Date: Sun, 15 Oct 2017 09:42:51 +0200
Subject: [PATCH] [Compose] Remove init where possible or replace init by tini,
 set grace periods

---
 docker-compose.yml | 10 +++-------
 1 file changed, 3 insertions(+), 7 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index cc0a13e4..4f595cde 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -5,7 +5,6 @@ services:
       image: mailcow/unbound:1.0
       build: ./data/Dockerfiles/unbound
       command: /usr/sbin/unbound
-      init: true
       depends_on:
         mysql-mailcow:
           condition: service_healthy
@@ -34,7 +33,6 @@ services:
         - MYSQL_DATABASE=${DBNAME}
         - MYSQL_USER=${DBUSER}
         - MYSQL_PASSWORD=${DBPASS}
-      init: true
       restart: always
       dns:
         - 172.22.1.254
@@ -73,7 +71,7 @@ services:
     rspamd-mailcow:
       image: mailcow/rspamd:1.10
       build: ./data/Dockerfiles/rspamd
-      command: "/usr/bin/rspamd -f -u _rspamd -g _rspamd"
+      stop_grace_period: 30s
       depends_on:
         - nginx-mailcow
       volumes:
@@ -84,7 +82,6 @@ services:
         - dkim-vol-1:/data/dkim
         - rspamd-vol-1:/var/lib/rspamd
       restart: always
-      init: true
       dns:
         - 172.22.1.254
       hostname: rspamd
@@ -251,7 +248,6 @@ services:
         - mysql-mailcow
       image: mailcow/acme:1.21
       build: ./data/Dockerfiles/acme
-      init: true
       dns:
         - 172.22.1.254
       environment:
@@ -275,6 +271,7 @@ services:
     fail2ban-mailcow:
       image: mailcow/fail2ban:1.7
       build: ./data/Dockerfiles/fail2ban
+      stop_grace_period: 30s
       depends_on:
         - dovecot-mailcow
         - postfix-mailcow
@@ -283,7 +280,6 @@ services:
         - redis-mailcow
       restart: always
       privileged: true
-      init: true
       environment:
         - TZ=${TZ}
         - SKIP_FAIL2BAN=${SKIP_FAIL2BAN:-n}
@@ -314,8 +310,8 @@ services:
 
     dockerapi-mailcow:
       image: mailcow/dockerapi:1.0
+      stop_grace_period: 3s
       build: ./data/Dockerfiles/dockerapi
-      init: false
       volumes:
         - /var/run/docker.sock:/var/run/docker.sock:ro
       networks: