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

[Compose] Removed some static IPs, added local configs, pushed new images

master
andre.peters 2018-01-21 15:03:24 +01:00
parent 43770434b3
commit 76573da3b9
1 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
docker-compose.yml
View File

@ -32,7 +32,6 @@ services:
- 172.22.1.254 - 172.22.1.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.250
aliases: aliases:
- mysql - mysql
@ -66,7 +65,7 @@ services:
- clamd - clamd
rspamd-mailcow: rspamd-mailcow:
image: mailcow/rspamd:1.15 image: mailcow/rspamd:1.16
build: ./data/Dockerfiles/rspamd build: ./data/Dockerfiles/rspamd
stop_grace_period: 30s stop_grace_period: 30s
depends_on: depends_on:
@ -86,12 +85,11 @@ services:
hostname: rspamd hostname: rspamd
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.253
aliases: aliases:
- rspamd - rspamd
php-fpm-mailcow: php-fpm-mailcow:
image: mailcow/phpfpm:1.8 image: mailcow/phpfpm:1.9
build: ./data/Dockerfiles/phpfpm build: ./data/Dockerfiles/phpfpm
command: "php-fpm -d date.timezone=${TZ} -d expose_php=0" command: "php-fpm -d date.timezone=${TZ} -d expose_php=0"
depends_on: depends_on:
@ -101,6 +99,9 @@ services:
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
- dkim-vol-1:/data/dkim - dkim-vol-1:/data/dkim
- ./data/conf/rspamd/meta_exporter:/meta_exporter:ro - ./data/conf/rspamd/meta_exporter:/meta_exporter:ro
- ./data/conf/phpfpm/php-fpm.d/www.conf:/usr/local/etc/php-fpm.d/www.conf
- ./data/conf/phpfpm/php-fpm.d/system.conf:/usr/local/etc/php-fpm.d/system.conf
- ./data/conf/phpfpm/php-conf.d/opcache-recommended.ini:/usr/local/etc/php/conf.d/opcache-recommended.ini
environment: environment:
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES}
- TZ=${TZ} - TZ=${TZ}
@ -125,7 +126,7 @@ services:
- phpfpm - phpfpm
sogo-mailcow: sogo-mailcow:
image: mailcow/sogo:1.13 image: mailcow/sogo:1.14
build: ./data/Dockerfiles/sogo build: ./data/Dockerfiles/sogo
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
@ -141,7 +142,6 @@ services:
- 172.22.1.254 - 172.22.1.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.252
aliases: aliases:
- sogo - sogo
@ -184,7 +184,7 @@ services:
- dovecot - dovecot
postfix-mailcow: postfix-mailcow:
image: mailcow/postfix:1.11 image: mailcow/postfix:1.12
build: ./data/Dockerfiles/postfix build: ./data/Dockerfiles/postfix
volumes: volumes:
- ./data/conf/postfix:/opt/postfix/conf - ./data/conf/postfix:/opt/postfix/conf
@ -252,7 +252,6 @@ services:
- 172.22.1.254 - 172.22.1.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.251
aliases: aliases:
- nginx - nginx
@ -305,7 +304,7 @@ services:
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
watchdog-mailcow: watchdog-mailcow:
image: mailcow/watchdog:1.12 image: mailcow/watchdog:1.13
# Debug # Debug
#command: /watchdog.sh #command: /watchdog.sh
build: ./data/Dockerfiles/watchdog build: ./data/Dockerfiles/watchdog
@ -323,7 +322,6 @@ services:
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.248
aliases: aliases:
- watchdog - watchdog