Update Mailu to 1.6

roles/mailu-docker/files/mailu/docker-compose.yml

@@ -1,15 +1,23 @@
-version: '2'
+version: '3.6'
 
 networks:
   web:
     external:
       name: web
+  default:
+    driver: bridge
+    ipam:
+      driver: default
+      config:
+        - subnet: 172.22.0.0/16
 
 services:
   front:
     image: mailu/nginx:$VERSION
     restart: always
     env_file: .env
+    logging:
+      driver: json-file
     ports:
       - "$BIND_ADDRESS4:110:110"
       - "$BIND_ADDRESS4:143:143"
@@ -19,15 +27,16 @@ services:
       - "$BIND_ADDRESS4:465:465"
       - "$BIND_ADDRESS4:587:587"
     labels:
-      - "traefik.backend=mailu-admin"
+      - "traefik.backend=webmail"
       - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:mailu.banditlair.com"
+      - "traefik.frontend.rule=Host:webmail.banditlair.com"
       - "traefik.enable=true"
       - "traefik.port=80"
       - "traefik.default.protocol=http"
     volumes:
       - "../traefik/certs/ssl/banditlair.com.crt:/certs/cert.pem"
       - "../traefik/certs/ssl/banditlair.com.key:/certs/key.pem"
+      - "/var/lib/mailu/overrides/nginx:/overrides"
     networks:
       - web
       - default
@@ -36,82 +45,79 @@ services:
     image: redis:alpine
     restart: always
     volumes:
-      - "$ROOT/redis:/data"
+      - "/var/lib/mailu/redis:/data"
+
+  resolver:
+    image: mailu/unbound:$VERSION
+    restart: always
+    env_file: .env
+    networks:
+      default:
+        ipv4_address: 172.22.255.254
+
+  admin:
+    image: mailu/admin:$VERSION
+    restart: always
+    env_file: .env
+    volumes:
+      - "/var/lib/mailu/data:/data"
+      - "/var/lib/mailu/dkim:/dkim"
+    depends_on:
+      - redis
 
   imap:
     image: mailu/dovecot:$VERSION
     restart: always
     env_file: .env
     volumes:
-      - "$ROOT/data:/data"
-      - "$ROOT/mail:/mail"
+      - "/var/lib/mailu/data:/data"
+      - "/var/lib/mailu/mail:/mail"
       - "./overrides:/overrides"
+    depends_on:
+      - front
 
   smtp:
     image: mailu/postfix:$VERSION
     restart: always
     env_file: .env
     volumes:
-      - "$ROOT/data:/data"
+      - "/var/lib/mailu/data:/data"
       - "./overrides:/overrides"
+    depends_on:
+      - front
+      - resolver
+    dns:
+      - 172.22.255.254
 
   antispam:
     image: mailu/rspamd:$VERSION
     restart: always
     env_file: .env
     volumes:
-      - "$ROOT/filter:/var/lib/rspamd"
-      - "$ROOT/dkim:/dkim"
+      - "/var/lib/mailu/filter:/var/lib/rspamd"
+      - "/var/lib/mailu/dkim:/dkim"
       - "./overrides/rspamd:/etc/rspamd/override.d"
-
-  antivirus:
-    image: mailu/$ANTIVIRUS:$VERSION
-    restart: always
-    env_file: .env
-    volumes:
-      - "$ROOT/filter:/data"
-
-  webdav:
-    image: mailu/$WEBDAV:$VERSION
-    restart: always
-    env_file: .env
-    volumes:
-      - "$ROOT/dav:/data"
-
-  admin:
-    image: mailu/admin:$VERSION
-    restart: always
-    env_file: .env
-    expose:
-      - 80
-    volumes:
-      - "$ROOT/data:/data"
-      - "$ROOT/dkim:/dkim"
-      - /var/run/docker.sock:/var/run/docker.sock:ro
     depends_on:
-      - redis
-
-  webmail:
-    image: hardware/rainloop
-    restart: always
-    expose:
-      - 8888
-    labels:
-      - "traefik.backend=webmail"
-      - "traefik.docker.network=web"
-      - "traefik.frontend.rule=Host:webmail.banditlair.com"
-      - "traefik.enable=true"
-      - "traefik.port=8888"
-      - "traefik.default.protocol=http"
-    volumes:
-      - "$ROOT/webmail:/rainloop/data"
-    networks:
-      - web
-      - default
+      - front
+      - resolver
+    dns:
+      - 172.22.255.254
 
   fetchmail:
     image: mailu/fetchmail:$VERSION
     restart: always
     env_file: .env
+    depends_on:
+      - resolver
+    dns:
+      - 172.22.255.254
+
+  webmail:
+    image: mailu/rainloop
+    restart: always
+    env_file: .env
     volumes:
-      - "$ROOT/data:/data"
+      - "/var/lib/mailu/webmail:/data"
+    depends_on:
+      - imap
+