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

Add Nginx HTTP listener, add build flags for containers, add Postfix data volume

master
andryyy 2017-02-28 09:59:54 +01:00
parent bc3cb99fa8
commit e6b5ce44a6
1 changed files with 13 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
docker-compose.yml
View File

@ -72,6 +72,7 @@ services:
rspamd-mailcow: rspamd-mailcow:
image: andryyy/mailcow-dockerized:rspamd image: andryyy/mailcow-dockerized:rspamd
build: ./data/Dockerfiles/rspamd
depends_on: depends_on:
- nginx-mailcow - nginx-mailcow
volumes: volumes:
@ -92,6 +93,7 @@ services:
php-fpm-mailcow: php-fpm-mailcow:
image: andryyy/mailcow-dockerized:phpfpm image: andryyy/mailcow-dockerized:phpfpm
build: ./data/Dockerfiles/php-fpm
command: "php-fpm -d date.timezone=${TZ}" command: "php-fpm -d date.timezone=${TZ}"
depends_on: depends_on:
- bind9-mailcow - bind9-mailcow
@ -115,6 +117,7 @@ services:
sogo-mailcow: sogo-mailcow:
image: andryyy/mailcow-dockerized:sogo image: andryyy/mailcow-dockerized:sogo
build: ./data/Dockerfiles/sogo
depends_on: depends_on:
- bind9-mailcow - bind9-mailcow
environment: environment:
@ -137,6 +140,7 @@ services:
rmilter-mailcow: rmilter-mailcow:
image: andryyy/mailcow-dockerized:rmilter image: andryyy/mailcow-dockerized:rmilter
build: ./data/Dockerfiles/rmilter
depends_on: depends_on:
- bind9-mailcow - bind9-mailcow
volumes: volumes:
@ -152,6 +156,7 @@ services:
dovecot-mailcow: dovecot-mailcow:
image: andryyy/mailcow-dockerized:dovecot image: andryyy/mailcow-dockerized:dovecot
build: ./data/Dockerfiles/dovecot
depends_on: depends_on:
- bind9-mailcow - bind9-mailcow
volumes: volumes:
@ -181,11 +186,13 @@ services:
postfix-mailcow: postfix-mailcow:
image: andryyy/mailcow-dockerized:postfix image: andryyy/mailcow-dockerized:postfix
build: ./data/Dockerfiles/postfix
depends_on: depends_on:
- bind9-mailcow - bind9-mailcow
volumes: volumes:
- ./data/conf/postfix:/opt/postfix/conf - ./data/conf/postfix:/opt/postfix/conf
- ./data/assets/ssl:/etc/ssl/mail/:ro - ./data/assets/ssl:/etc/ssl/mail/:ro
- postfix-vol-1:/var/spool/postfix
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@ -235,9 +242,12 @@ services:
- sogo-mailcow - sogo-mailcow
- php-fpm-mailcow - php-fpm-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_plain.template > /etc/nginx/conf.d/listen_plain.active &&
envsubst < /etc/nginx/conf.d/listen_ssl.template > /etc/nginx/conf.d/listen_ssl.active &&
nginx -g 'daemon off;'"
environment: environment:
- HTTPS_PORT=${HTTPS_PORT:-443} - HTTPS_PORT=${HTTPS_PORT:-443}
- HTTP_PORT=${HTTP_PORT:-80}
volumes: volumes:
- ./data/web:/web:ro - ./data/web:/web:ro
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@ -248,6 +258,7 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
ports: ports:
- "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}" - "${HTTPS_BIND:-0.0.0.0}:${HTTPS_PORT:-443}:${HTTPS_PORT:-443}"
- "${HTTP_BIND:-127.0.0.1}:${HTTP_PORT:-80}:${HTTP_PORT:-80}"
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
@ -269,3 +280,4 @@ volumes:
dkim-vol-1: dkim-vol-1:
redis-vol-1: redis-vol-1:
rspamd-vol-1: rspamd-vol-1:
postfix-vol-1: