7x31/mailcow-dockerized
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'dev'

Browse Source
This commit is contained in:
André
2017-10-27 11:24:29 +02:00
parent 255d4be785 1e9bc49f2c
commit eb6f0ebd81
6 changed files with 89 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
docker-compose.yml
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: