Browse Source

[Compose] Remove init where possible or replace init by tini, set grace periods

André 8 years ago
parent
commit
a35bf76154
1 changed files with 3 additions and 7 deletions
  1. 3 7
      docker-compose.yml

+ 3 - 7
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: