瀏覽代碼

Fix service names...

andryyy 8 年之前
父節點
當前提交
865634a340
共有 1 個文件被更改,包括 14 次插入14 次删除
  1. 14 14
      docker-compose.yml

+ 14 - 14
docker-compose.yml

@@ -15,7 +15,7 @@ services:
     mysql-mailcow:
     mysql-mailcow:
       image: mariadb:10.1
       image: mariadb:10.1
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       command: mysqld
       command: mysqld
       volumes:
       volumes:
         - mysql-vol-1:/var/lib/mysql/
         - mysql-vol-1:/var/lib/mysql/
@@ -37,7 +37,7 @@ services:
     redis-mailcow:
     redis-mailcow:
       image: redis
       image: redis
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       volumes:
       volumes:
         - redis-vol-1:/data/
         - redis-vol-1:/data/
       restart: always
       restart: always
@@ -52,7 +52,7 @@ services:
     rspamd-mailcow:
     rspamd-mailcow:
       image: andryyy/mailcow-dockerized:rspamd
       image: andryyy/mailcow-dockerized:rspamd
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       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
@@ -72,7 +72,7 @@ services:
       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
+        - pdns-mailcow
       volumes:
       volumes:
         - ./data/web:/web:ro
         - ./data/web:/web:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
         - ./data/conf/rspamd/dynmaps:/dynmaps:ro
@@ -94,8 +94,8 @@ services:
     sogo-mailcow:
     sogo-mailcow:
       image: andryyy/mailcow-dockerized:sogo
       image: andryyy/mailcow-dockerized:sogo
       depends_on:
       depends_on:
-        - pdns
-        - mysql
+        - pdns-mailcow
+        - mysql-mailcow
       environment:
       environment:
         - DBNAME=${DBNAME}
         - DBNAME=${DBNAME}
         - DBUSER=${DBUSER}
         - DBUSER=${DBUSER}
@@ -116,7 +116,7 @@ services:
     rmilter-mailcow:
     rmilter-mailcow:
       image: andryyy/mailcow-dockerized:rmilter
       image: andryyy/mailcow-dockerized:rmilter
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       volumes:
       volumes:
         - ./data/conf/rmilter/:/etc/rmilter.conf.d/:ro
         - ./data/conf/rmilter/:/etc/rmilter.conf.d/:ro
       restart: always
       restart: always
@@ -131,7 +131,7 @@ services:
     dovecot-mailcow:
     dovecot-mailcow:
       image: andryyy/mailcow-dockerized:dovecot
       image: andryyy/mailcow-dockerized:dovecot
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       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
@@ -160,7 +160,7 @@ services:
     postfix-mailcow:
     postfix-mailcow:
       image: andryyy/mailcow-dockerized:postfix
       image: andryyy/mailcow-dockerized:postfix
       depends_on:
       depends_on:
-        - pdns
+        - pdns-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
@@ -185,7 +185,7 @@ services:
     memcached-mailcow:
     memcached-mailcow:
       image: memcached
       image: memcached
       depends_on:
       depends_on:
-        - pdns
+        - pdns-mailcow
       restart: always
       restart: always
       dns:
       dns:
         - 172.22.1.254
         - 172.22.1.254
@@ -197,10 +197,10 @@ services:
 
 
     nginx-mailcow:
     nginx-mailcow:
       depends_on:
       depends_on:
-        - mysql
-        - sogo
-        - phpfpm
-        - rspamd
+        - mysql-mailcow
+        - sogo-mailcow
+        - php-fpm-mailcow
+        - rspamd-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.template > /etc/nginx/conf.d/listen.active && nginx -g 'daemon off;'"
       environment:
       environment: