paxton
/
mailcow
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

master
André 2017-10-15 09:42:51 +02:00
parent 6b6470fe54
commit a35bf76154
1 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
docker-compose.yml
View File

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