Updated docker-compose.yml

docker-compose.yml

@@ -1,92 +1,79 @@
-version: '2'
+version: '3.7'
+
+x-common: &common
+#  restart: unless-stopped
+  env_file:
+    - env
 
 services:
-    database:
+    postgresql:
+        <<: *common
         build: ./postgresql
-        container_name: mx-postgresql
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                    - postgresql.mx.internal.docker
+                    - postgresql.main.internal.docker
         volumes:
             - ./data/postgresql/data:/var/lib/postgresql/data
-            - ./data/postgresql/backup:/var/lib/postgresql/backup
         ports:
             - "127.0.0.1:34000:5432"
-        env_file:
-            - env
 
     postfixadmin:
+        <<: *common
         build: ./postfixadmin
-        container_name: mx-postfixadmin
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                    - postfixadmin.mx.internal.docker
+                    - postfixadmin.main.internal.docker
         ports:
             - "127.0.0.1:34001:80"
-        env_file:
-            - env
 
     postfix:
+        <<: *common
         build: ./postfix
-        container_name: mx-postfix
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                    - postfix.mx.internal.docker
+                    - mail1.example.com
+        volumes:
+            - ./data/common/certs:/etc/ssl/certs
         ports:
             - "0.0.0.0:25:25"
             - "0.0.0.0:465:465"
             - "0.0.0.0:587:587"
-        env_file:
-            - env
 
     dovecot:
+        <<: *common
         build: ./dovecot
-        container_name: mx-dovecot
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                    - dovecot.mx.internal.docker
+                    - dovecot.main.internal.docker
         volumes:
+            - ./data/common/certs:/etc/ssl/certs
             - ./data/dovecot/email:/var/email
         ports:
-            - "0.0.0.0:110:110"
             - "0.0.0.0:143:143"
             - "0.0.0.0:993:993"
-            - "0.0.0.0:995:995"
             - "0.0.0.0:4190:4190"
-        env_file:
-            - env
 
     opendkim:
+        <<: *common
         build: ./opendkim
-        container_name: mx-opendkim
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                    - opendkim.mx.internal.docker
+                    - opendkim.main.internal.docker
         volumes:
             - ./data/opendkim/keys:/etc/opendkim/keys
-        env_file:
-            - env
 
     milter-sasl:
+        <<: *common
         build: ./milter-sasl
-        container_name: mx-milter-sasl
-#        restart: unless-stopped
         networks:
-            mx.internal.docker:
+            main:
                 aliases:
-                  - milter-sasl.mx.internal.docker
-        env_file:
-            - env
+                  - milter-sasl.main.internal.docker
 
 networks:
-    mx.internal.docker:
+    main: