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

Use static IPs for Rspamd and SOGo to not emerg Nginx, start Rspamd after Nginx, add health check for SQL

master
andryyy 2017-02-02 10:09:10 +01:00
parent 272087ba39
commit 920c0c064e
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@ -3,6 +3,9 @@ version: '2.1'
services: services:
pdns-mailcow: pdns-mailcow:
image: andryyy/mailcow-dockerized:pdns image: andryyy/mailcow-dockerized:pdns
depends_on:
mysql-mailcow:
condition: service_healthy
volumes: volumes:
- ./data/conf/pdns/:/etc/powerdns/ - ./data/conf/pdns/:/etc/powerdns/
restart: always restart: always
@ -14,9 +17,11 @@ services:
mysql-mailcow: mysql-mailcow:
image: mariadb:10.1 image: mariadb:10.1
depends_on: healthcheck:
- pdns-mailcow test: ["CMD", "mysqladmin", "ping", "--host", "localhost", "--silent"]
command: mysqld interval: 10s
timeout: 30s
retries: 5
volumes: volumes:
- mysql-vol-1:/var/lib/mysql/ - mysql-vol-1:/var/lib/mysql/
- ./data/conf/mysql/:/etc/mysql/conf.d/:ro - ./data/conf/mysql/:/etc/mysql/conf.d/:ro
@ -52,7 +57,7 @@ services:
rspamd-mailcow: rspamd-mailcow:
image: andryyy/mailcow-dockerized:rspamd image: andryyy/mailcow-dockerized:rspamd
depends_on: depends_on:
- pdns-mailcow - nginx-mailcow
volumes: volumes:
- ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro - ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro
- ./data/conf/rspamd/local.d/:/etc/rspamd/local.d:ro - ./data/conf/rspamd/local.d/:/etc/rspamd/local.d:ro
@ -65,6 +70,7 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.253
aliases: aliases:
- rspamd - rspamd
@ -95,7 +101,6 @@ services:
image: andryyy/mailcow-dockerized:sogo image: andryyy/mailcow-dockerized:sogo
depends_on: depends_on:
- pdns-mailcow - pdns-mailcow
- mysql-mailcow
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@ -110,6 +115,7 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.252
aliases: aliases:
- sogo - sogo
@ -197,10 +203,8 @@ services:
nginx-mailcow: nginx-mailcow:
depends_on: depends_on:
- mysql-mailcow
- sogo-mailcow - sogo-mailcow
- php-fpm-mailcow - php-fpm-mailcow
- rspamd-mailcow
image: nginx:mainline image: nginx:mainline
command: /bin/bash -c "envsubst < /etc/nginx/conf.d/listen.template > /etc/nginx/conf.d/listen.active && nginx -g 'daemon off;'" command: /bin/bash -c "envsubst < /etc/nginx/conf.d/listen.template > /etc/nginx/conf.d/listen.active && nginx -g 'daemon off;'"
environment: environment: