[Rspamd] Echo dummy for fowardingshosts map; Use higher map reading interval;

[Dockerapi] Exit on sigterm;
[Watchdog] Wait for dockerapi-mailcow to be online
This commit is contained in:
André
2017-10-27 11:22:39 +02:00
parent fe2bd9779b
commit 1e9bc49f2c
5 changed files with 88 additions and 45 deletions

View File

@@ -215,12 +215,14 @@ services:
depends_on:
- sogo-mailcow
- php-fpm-mailcow
- redis-mailcow
image: nginx:mainline-alpine
command: /bin/sh -c "envsubst < /etc/nginx/conf.d/templates/listen_plain.template > /etc/nginx/conf.d/listen_plain.active &&
envsubst < /etc/nginx/conf.d/templates/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
envsubst < /etc/nginx/conf.d/templates/server_name.template > /etc/nginx/conf.d/server_name.active &&
nginx -qt &&
until ping phpfpm -c1 > /dev/null; do sleep 1; done &&
until ping redis -c1 > /dev/null; do sleep 1; done &&
exec nginx -g 'daemon off;'"
environment:
- HTTPS_PORT=${HTTPS_PORT:-443}
@@ -291,7 +293,7 @@ services:
- /lib/modules:/lib/modules:ro
watchdog-mailcow:
image: mailcow/watchdog:1.8
image: mailcow/watchdog:1.9
build: ./data/Dockerfiles/watchdog
volumes:
- vmail-vol-1:/vmail:ro
@@ -310,7 +312,7 @@ services:
- watchdog
dockerapi-mailcow:
image: mailcow/dockerapi:1.0
image: mailcow/dockerapi:1.1
stop_grace_period: 3s
build: ./data/Dockerfiles/dockerapi
volumes: