From 3e8ef151e6b1420cbfba304bd71e1116c38e7268 Mon Sep 17 00:00:00 2001
From: Jesse Luehrs <doy@tozt.net>
Date: Thu, 22 Jul 2021 20:09:30 -0400
Subject: also remove these variable expansions

apparently podman doesn't support this properly?
---
 modules/mail/templates/docker-compose.yml.erb | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/modules/mail/templates/docker-compose.yml.erb b/modules/mail/templates/docker-compose.yml.erb
index 0141af1..4d21bb1 100644
--- a/modules/mail/templates/docker-compose.yml.erb
+++ b/modules/mail/templates/docker-compose.yml.erb
@@ -15,7 +15,7 @@ services:
     
   # Core services
   front:
-    image: docker.io/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}nginx:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/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/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}unbound:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/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/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}admin:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/admin:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -53,7 +53,7 @@ services:
       - redis
 
   imap:
-    image: docker.io/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}dovecot:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/dovecot:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -63,7 +63,7 @@ services:
       - front
 
   smtp:
-    image: docker.io/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}postfix:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/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/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rspamd:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/rspamd:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -91,7 +91,7 @@ services:
   # Optional services
 
   webdav:
-    image: docker.io/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}radicale:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/radicale:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
@@ -100,7 +100,7 @@ services:
 
   # Webmail
   webmail:
-    image: docker.io/${DOCKER_ORG:-mailu}/${DOCKER_PREFIX:-}rainloop:${MAILU_VERSION:-1.7}
+    image: docker.io/mailu/rainloop:${MAILU_VERSION:-1.7}
     restart: always
     env_file: mailu.env
     volumes:
-- 
cgit v1.2.3