Remove aliases

master
andryyy 2017-01-21 11:49:55 +01:00
parent c34a7b69b8
commit e87c5d30dd
1 changed files with 26 additions and 52 deletions

View File

@ -1,7 +1,7 @@
version: '2' version: '2'
services: services:
pdns-mailcow: pdns:
image: andryyy/mailcow-dockerized:pdns image: andryyy/mailcow-dockerized:pdns
volumes: volumes:
- ./data/conf/pdns/:/etc/powerdns/ - ./data/conf/pdns/:/etc/powerdns/
@ -9,13 +9,11 @@ services:
networks: networks:
mailcow-network: mailcow-network:
ipv4_address: 172.22.1.254 ipv4_address: 172.22.1.254
aliases:
- pdns
mysql-mailcow: mysql:
image: mariadb:10.1 image: mariadb:10.1
depends_on: depends_on:
- pdns-mailcow - pdns
command: mysqld command: mysqld
volumes: volumes:
- mysql-vol-1:/var/lib/mysql/ - mysql-vol-1:/var/lib/mysql/
@ -31,13 +29,11 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
aliases:
- mysql
redis-mailcow: redis:
image: redis image: redis
depends_on: depends_on:
- pdns-mailcow - pdns
volumes: volumes:
- redis-vol-1:/data/ - redis-vol-1:/data/
restart: always restart: always
@ -46,13 +42,11 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
aliases:
- redis
rspamd-mailcow: rspamd:
image: andryyy/mailcow-dockerized:rspamd image: andryyy/mailcow-dockerized:rspamd
depends_on: depends_on:
- pdns-mailcow - pdns
volumes: volumes:
- ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro - ./data/conf/rspamd/override.d/:/etc/rspamd/override.d:ro
- ./data/conf/rspamd/local.d/:/etc/rspamd/local.d:ro - ./data/conf/rspamd/local.d/:/etc/rspamd/local.d:ro
@ -65,14 +59,12 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
aliases:
- rspamd
phpfpm-mailcow: phpfpm:
image: andryyy/mailcow-dockerized:phpfpm image: andryyy/mailcow-dockerized:phpfpm
command: "php-fpm -d date.timezone=${TZ}" command: "php-fpm -d date.timezone=${TZ}"
depends_on: depends_on:
- pdns-mailcow - pdns
volumes: volumes:
- ./data/web:/web:ro - ./data/web:/web:ro
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@ -88,14 +80,12 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
aliases:
- phpfpm
sogo-mailcow: sogo:
image: andryyy/mailcow-dockerized:sogo image: andryyy/mailcow-dockerized:sogo
depends_on: depends_on:
- pdns-mailcow - pdns
- mysql-mailcow - mysql
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@ -110,13 +100,11 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
aliases:
- sogo
rmilter-mailcow: rmilter:
image: andryyy/mailcow-dockerized:rmilter image: andryyy/mailcow-dockerized:rmilter
depends_on: depends_on:
- pdns-mailcow - pdns
volumes: volumes:
- ./data/conf/rmilter/:/etc/rmilter.conf.d/:ro - ./data/conf/rmilter/:/etc/rmilter.conf.d/:ro
restart: always restart: always
@ -125,19 +113,16 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
aliases:
- rmilter
dovecot-mailcow: dovecot:
image: andryyy/mailcow-dockerized:dovecot image: andryyy/mailcow-dockerized:dovecot
depends_on: depends_on:
- pdns-mailcow - pdns
volumes: volumes:
- ./data/conf/dovecot:/etc/dovecot - ./data/conf/dovecot:/etc/dovecot
- ./data/assets/ssl:/etc/ssl/mail/:ro - ./data/assets/ssl:/etc/ssl/mail/:ro
- ./data/conf/sogo/:/etc/sogo/
- vmail-vol-1:/var/vmail - vmail-vol-1:/var/vmail
volumes_from:
- sogo-mailcow
environment: environment:
- DBNAME=${DBNAME} - DBNAME=${DBNAME}
- DBUSER=${DBUSER} - DBUSER=${DBUSER}
@ -155,13 +140,11 @@ services:
hostname: ${MAILCOW_HOSTNAME} hostname: ${MAILCOW_HOSTNAME}
networks: networks:
mailcow-network: mailcow-network:
aliases:
- dovecot
postfix-mailcow: postfix:
image: andryyy/mailcow-dockerized:postfix image: andryyy/mailcow-dockerized:postfix
depends_on: depends_on:
- pdns-mailcow - pdns
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
@ -180,34 +163,28 @@ services:
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
aliases:
- postfix
memcached-mailcow: memcached:
image: memcached image: memcached
depends_on: depends_on:
- pdns-mailcow - pdns
restart: always restart: always
dns: dns:
- 172.22.1.254 - 172.22.1.254
dns_search: mailcow-network dns_search: mailcow-network
networks: networks:
mailcow-network: mailcow-network:
aliases:
- memcached
nginx-mailcow: nginx:
depends_on: depends_on:
- mysql-mailcow - mysql
- sogo-mailcow - sogo
- phpfpm-mailcow - phpfpm
- rspamd-mailcow - rspamd
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} - HTTPS_PORT=${HTTPS_PORT}
volumes_from:
- sogo-mailcow
volumes: volumes:
- ./data/web:/web:ro - ./data/web:/web:ro
- ./data/conf/rspamd/dynmaps:/dynmaps:ro - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@ -221,8 +198,6 @@ services:
restart: always restart: always
networks: networks:
mailcow-network: mailcow-network:
aliases:
- nginx
networks: networks:
mailcow-network: mailcow-network:
@ -231,7 +206,6 @@ networks:
driver: default driver: default
config: config:
- subnet: 172.22.1.0/24 - subnet: 172.22.1.0/24
gateway: 172.22.1.1
volumes: volumes:
vmail-vol-1: vmail-vol-1: