Push to compose 2.1

master
andryyy 2017-01-30 10:47:32 +01:00
parent 830510f28e
commit 4856a6d931
1 changed files with 11 additions and 11 deletions

View File

@ -1,4 +1,4 @@
version: '2' version: '2.1'
services: services:
pdns-mailcow: pdns-mailcow:
@ -142,11 +142,11 @@ services:
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
ports: ports:
- "${IMAP_PORT:=143}:143" - "${IMAP_PORT:-143}:143"
- "${IMAPS_PORT:=993}:993" - "${IMAPS_PORT:-993}:993"
- "${POP_PORT:=110}:110" - "${POP_PORT-110}:110"
- "${POPS_PORT:=995}:995" - "${POPS_PORT:-995}:995"
- "${SIEVE_PORT:=4190}:4190" - "${SIEVE_PORT:-4190}:4190"
dns: dns:
- 172.22.1.254 - 172.22.1.254
dns_search: mailcow-network dns_search: mailcow-network
@ -169,9 +169,9 @@ services:
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
ports: ports:
- "${SMTP_PORT:=25}:25" - "${SMTP_PORT:-25}:25"
- "${SMTPS_PORT:=465}:465" - "${SMTPS_PORT:-465}:465"
- "${SUBMISSION_PORT:=587}:587" - "${SUBMISSION_PORT:-587}:587"
restart: always restart: always
hostname: ${MAILCOW_HOSTNAME} hostname: ${MAILCOW_HOSTNAME}
dns: dns:
@ -204,7 +204,7 @@ services:
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:
- HTTPS_PORT=${HTTPS_PORT:=443} - HTTPS_PORT=${HTTPS_PORT:-443}
volumes: volumes:
- ./data/web:/web:ro - ./data/web:/web:ro
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@ -214,7 +214,7 @@ services:
- 172.22.1.254 - 172.22.1.254
dns_search: mailcow-network dns_search: mailcow-network
ports: ports:
- "${HTTPS_PORT:=443}:${HTTPS_PORT:=443}" - "${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network: