Some cleanup and changes:

- Don't upgrade the docker-compose file. (Not in the scope of this feature)
- No need to use aliases. Docker already resolves to service names
- Use a fixed IP range, which stays clear of the network ranges used by Docker. (172.xx.0.0/16)

docs/compose/.env

@@ -21,9 +21,6 @@ SECRET_KEY=ChangeMeChangeMe
 BIND_ADDRESS4=127.0.0.1
 BIND_ADDRESS6=::1
 
-# Internal Docker network
-IPV4_NETWORK=172.22.1
-
 # Main mail domain
 DOMAIN=mailu.io
 

docs/compose/docker-compose.yml

@@ -1,4 +1,4 @@
-version: '2.1'
+version: '2'
 
 services:
 
@@ -30,20 +30,14 @@ services:
     depends_on:
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - front
 
   unbound:
     image: mailu/unbound:$VERSION
     restart: always
     networks:
-      backend:
+      default:
-        ipv4_address: ${IPV4_NETWORK:-172.22.1}.254
+        ipv4_address: 10.177.20.254
-        aliases:
-          - unbound
 
   redis:
     image: redis:alpine
@@ -51,13 +45,9 @@ services:
     volumes:
       - "$ROOT/redis:/data"
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
     depends_on:
       - unbound
-    networks:
-      backend:
-        aliases:
-          - redis
 
   imap:
     image: mailu/dovecot:$VERSION
@@ -71,11 +61,7 @@ services:
       - front
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - imap
 
   smtp:
     image: mailu/postfix:$VERSION
@@ -88,11 +74,7 @@ services:
       - front
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - smtp
 
   antispam:
     image: mailu/rspamd:$VERSION
@@ -106,11 +88,7 @@ services:
       - front
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - antispam
 
   antivirus:
     image: mailu/$ANTIVIRUS:$VERSION
@@ -121,11 +99,7 @@ services:
     depends_on:
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - antivirus
 
   webdav:
     image: mailu/$WEBDAV:$VERSION
@@ -136,11 +110,7 @@ services:
     depends_on:
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - webdav
 
   admin:
     image: mailu/admin:$VERSION
@@ -154,11 +124,7 @@ services:
       - redis
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - admin
 
   webmail:
     image: "mailu/$WEBMAIL:$VERSION"
@@ -170,11 +136,7 @@ services:
       - imap
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - webmail
 
   fetchmail:
     image: mailu/fetchmail:$VERSION
@@ -185,16 +147,12 @@ services:
     depends_on:
       - unbound
     dns:
-      - ${IPV4_NETWORK:-172.22.1}.254
+      - 10.177.20.254
-    networks:
-      backend:
-        aliases:
-          - fetchmail
 
 networks:
-  backend:
+  default:
     driver: bridge
     ipam:
       driver: default
       config:
-        - subnet: ${IPV4_NETWORK:-172.22.1}.0/24
+        - subnet: 10.177.20.0/24