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

Merge pull request #966 from mailcow/compose-vars

Browse Source 
Add default values for IPV4_NETWORK, IPV6_NETWORK, LOG_LINES to docker-compose.yml
This commit is contained in:
André Peters
2018-01-27 20:17:31 +01:00
committed by GitHub
parent 1f08e9a7b7 8f4b1244a6
commit bd83b47cea
1 changed files with 23 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
docker-compose.yml
View File

@@ -12,7 +12,7 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: ${IPV4_NETWORK}.254 ipv4_address: ${IPV4_NETWORK:-172.22.1}.254
aliases: aliases:
- unbound - unbound
@@ -29,7 +29,7 @@ services:
- MYSQL_PASSWORD=${DBPASS} - MYSQL_PASSWORD=${DBPASS}
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -43,10 +43,10 @@ services:
environment: environment:
- TZ=${TZ} - TZ=${TZ}
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: ${IPV4_NETWORK}.249 ipv4_address: ${IPV4_NETWORK:-172.22.1}.249
aliases: aliases:
- redis - redis
@@ -60,7 +60,7 @@ services:
volumes: volumes:
- ./data/conf/clamav/:/etc/clamav/ - ./data/conf/clamav/:/etc/clamav/
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -83,7 +83,7 @@ services:
- rspamd-vol-1:/var/lib/rspamd - rspamd-vol-1:/var/lib/rspamd
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
hostname: rspamd hostname: rspamd
networks: networks:
mailcow-network: mailcow-network:
@@ -105,7 +105,7 @@ services:
- ./data/conf/phpfpm/php-fpm.d/system.conf:/usr/local/etc/php-fpm.d/system.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 - ./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:-9999}
- TZ=${TZ} - TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@@ -121,7 +121,7 @@ services:
- SMTP_PORT=${SMTP_PORT:-25} - SMTP_PORT=${SMTP_PORT:-25}
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -135,13 +135,13 @@ services:
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
- TZ=${TZ} - TZ=${TZ}
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES:-9999}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
volumes: volumes:
- ./data/conf/sogo/:/etc/sogo/ - ./data/conf/sogo/:/etc/sogo/
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -159,7 +159,7 @@ services:
- vmail-vol-1:/var/vmail - vmail-vol-1:/var/vmail
- crypt-vol-1:/mail_crypt/ - crypt-vol-1:/mail_crypt/
environment: environment:
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES:-9999}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
@@ -178,7 +178,7 @@ services:
soft: 20000 soft: 20000
hard: 40000 hard: 40000
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
hostname: ${MAILCOW_HOSTNAME} hostname: ${MAILCOW_HOSTNAME}
networks: networks:
mailcow-network: mailcow-network:
@@ -194,7 +194,7 @@ services:
- postfix-vol-1:/var/spool/postfix - postfix-vol-1:/var/spool/postfix
- crypt-vol-1:/var/lib/zeyple - crypt-vol-1:/var/lib/zeyple
environment: environment:
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES:-9999}
- TZ=${TZ} - TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@@ -207,7 +207,7 @@ services:
- "${SUBMISSION_PORT:-587}:587" - "${SUBMISSION_PORT:-587}:587"
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
hostname: ${MAILCOW_HOSTNAME} hostname: ${MAILCOW_HOSTNAME}
networks: networks:
mailcow-network: mailcow-network:
@@ -218,7 +218,7 @@ services:
image: memcached:alpine image: memcached:alpine
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -253,7 +253,7 @@ services:
- "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}" - "${HTTP_BIND:-0.0.0.0}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
restart: always restart: always
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases:
@@ -266,9 +266,9 @@ services:
image: mailcow/acme:1.28 image: mailcow/acme:1.28
build: ./data/Dockerfiles/acme build: ./data/Dockerfiles/acme
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
environment: environment:
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES:-9999}
- ADDITIONAL_SAN=${ADDITIONAL_SAN} - ADDITIONAL_SAN=${ADDITIONAL_SAN}
- MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME} - MAILCOW_HOSTNAME=${MAILCOW_HOSTNAME}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
@@ -301,10 +301,10 @@ services:
environment: environment:
- TZ=${TZ} - TZ=${TZ}
- SKIP_FAIL2BAN=${SKIP_FAIL2BAN:-n} - SKIP_FAIL2BAN=${SKIP_FAIL2BAN:-n}
- IPV4_NETWORK=${IPV4_NETWORK} - IPV4_NETWORK=${IPV4_NETWORK:-172.22.1}
network_mode: "host" network_mode: "host"
dns: dns:
- ${IPV4_NETWORK}.254 - ${IPV4_NETWORK:-172.22.1}.254
volumes: volumes:
- /lib/modules:/lib/modules:ro - /lib/modules:/lib/modules:ro
@@ -317,7 +317,7 @@ services:
- vmail-vol-1:/vmail:ro - vmail-vol-1:/vmail:ro
restart: always restart: always
environment: environment:
- LOG_LINES=${LOG_LINES} - LOG_LINES=${LOG_LINES:-9999}
- TZ=${TZ} - TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@@ -361,8 +361,8 @@ networks:
ipam: ipam:
driver: default driver: default
config: config:
- subnet: ${IPV4_NETWORK}.0/24 - subnet: ${IPV4_NETWORK:-172.22.1}.0/24
- subnet: ${IPV6_NETWORK} - subnet: ${IPV6_NETWORK:-fd4d:6169:6c63:6f77::/64}
volumes: volumes:
vmail-vol-1: vmail-vol-1: