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