From 3257e44002cd62097c70a80368fb0228f0f86809 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 22 Jul 2021 20:37:21 -0400
Subject: switch back to docker

podman-compose doesn't handle networking properly yet
(https://github.com/containers/podman-compose/issues/119)
---
 modules/mail/templates/docker-compose.yml.erb | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

(limited to 'modules/mail/templates/docker-compose.yml.erb')

diff --git a/modules/mail/templates/docker-compose.yml.erb b/modules/mail/templates/docker-compose.yml.erb
index 4d21bb1..f31c1cf 100644
--- a/modules/mail/templates/docker-compose.yml.erb
+++ b/modules/mail/templates/docker-compose.yml.erb
@@ -8,14 +8,14 @@ services:
 
   # External dependencies
   redis:
-    image: docker.io/redis:alpine
+    image: redis:alpine
     restart: always
     volumes:
       - "/media/persistent/redis:/data"
     
   # Core services
   front:
-    image: docker.io/mailu/nginx:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     logging:
@@ -35,7 +35,7 @@ services:
       - "/media/persistent/overrides/nginx:/overrides"
 
   resolver:
-    image: docker.io/mailu/unbound:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-1.7}
     env_file: mailu.env
     restart: always
     networks:
@@ -43,7 +43,7 @@ services:
         ipv4_address: 192.168.203.254
 
   admin:
-    image: docker.io/mailu/admin:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -53,7 +53,7 @@ services:
       - redis
 
   imap:
-    image: docker.io/mailu/dovecot:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -63,7 +63,7 @@ services:
       - front
 
   smtp:
-    image: docker.io/mailu/postfix:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -75,7 +75,7 @@ services:
       - 192.168.203.254
 
   antispam:
-    image: docker.io/mailu/rspamd:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -91,7 +91,7 @@ services:
   # Optional services
 
   webdav:
-    image: docker.io/mailu/radicale:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -100,7 +100,7 @@ services:
 
   # Webmail
   webmail:
-    image: docker.io/mailu/rainloop:${MAILU_VERSION:-1.7}
+    image: ${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
-- 
cgit v1.2.3-54-g00ecf