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

[Compose] Add TZ for libc to containers, add Rspamd controller password file to Docker API

Browse Source
This commit is contained in:
andre.peters
2017-12-11 09:42:23 +01:00
parent d71b6f0ad1
commit f1d533eef6
1 changed files with 15 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
docker-compose.yml
View File

@@ -5,6 +5,8 @@ services:
image: mailcow/unbound:1.1 image: mailcow/unbound:1.1
build: ./data/Dockerfiles/unbound build: ./data/Dockerfiles/unbound
command: /usr/sbin/unbound command: /usr/sbin/unbound
environment:
- TZ=${TZ}
volumes: volumes:
- ./data/conf/unbound/unbound.conf:/etc/unbound/unbound.conf:ro - ./data/conf/unbound/unbound.conf:/etc/unbound/unbound.conf:ro
restart: always restart: always
@@ -20,6 +22,7 @@ services:
- mysql-vol-1:/var/lib/mysql/ - mysql-vol-1:/var/lib/mysql/
- ./data/conf/mysql/:/etc/mysql/conf.d/:ro - ./data/conf/mysql/:/etc/mysql/conf.d/:ro
environment: environment:
- TZ=${TZ}
- MYSQL_ROOT_PASSWORD=${DBROOT} - MYSQL_ROOT_PASSWORD=${DBROOT}
- MYSQL_DATABASE=${DBNAME} - MYSQL_DATABASE=${DBNAME}
- MYSQL_USER=${DBUSER} - MYSQL_USER=${DBUSER}
@@ -38,6 +41,8 @@ services:
volumes: volumes:
- redis-vol-1:/data/ - redis-vol-1:/data/
restart: always restart: always
environment:
- TZ=${TZ}
dns: dns:
- 172.22.1.254 - 172.22.1.254
networks: networks:
@@ -52,6 +57,7 @@ services:
restart: always restart: always
environment: environment:
- SKIP_CLAMD=${SKIP_CLAMD:-n} - SKIP_CLAMD=${SKIP_CLAMD:-n}
- TZ=${TZ}
dns: dns:
- 172.22.1.254 - 172.22.1.254
networks: networks:
@@ -65,6 +71,8 @@ services:
stop_grace_period: 30s stop_grace_period: 30s
depends_on: depends_on:
- nginx-mailcow - nginx-mailcow
environment:
- TZ=${TZ}
volumes: volumes:
- ./data/conf/rspamd/custom/:/etc/rspamd/custom:ro - ./data/conf/rspamd/custom/:/etc/rspamd/custom:ro
- ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro - ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro
@@ -93,6 +101,7 @@ services:
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
- dkim-vol-1:/data/dkim - dkim-vol-1:/data/dkim
environment: environment:
- TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
@@ -148,6 +157,7 @@ services:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
- TZ=${TZ}
ports: ports:
- "${DOVEADM_PORT:-127.0.0.1:19991}:12345" - "${DOVEADM_PORT:-127.0.0.1:19991}:12345"
- "${IMAP_PORT:-143}:143" - "${IMAP_PORT:-143}:143"
@@ -178,6 +188,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:
- TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
@@ -293,6 +304,7 @@ services:
- vmail-vol-1:/vmail:ro - vmail-vol-1:/vmail:ro
restart: always restart: always
environment: environment:
- TZ=${TZ}
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
- DBPASS=${DBPASS} - DBPASS=${DBPASS}
@@ -310,8 +322,11 @@ services:
restart: always restart: always
build: ./data/Dockerfiles/dockerapi build: ./data/Dockerfiles/dockerapi
oom_score_adj: -10 oom_score_adj: -10
environment:
- TZ=${TZ}
volumes: volumes:
- /var/run/docker.sock:/var/run/docker.sock:ro - /var/run/docker.sock:/var/run/docker.sock:ro
- ./data/conf/rspamd/override.d/worker-controller-password.inc:/access.inc:rw
networks: networks:
mailcow-network: mailcow-network:
aliases: aliases: