From bb0fd896b39fce4679938c540d2f5b2119091e3f Mon Sep 17 00:00:00 2001
From: Ionut Filip <ionut.philip@gmail.com>
Date: Tue, 11 Dec 2018 17:31:21 +0200
Subject: [PATCH] Fix some bugs in setup for stack flavor - Unbound and webmail
 images were hardcoded - Removed unnecesary environment keyword

---
 setup/flavors/stack/docker-compose.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/setup/flavors/stack/docker-compose.yml b/setup/flavors/stack/docker-compose.yml
index eef8e334..217667e1 100644
--- a/setup/flavors/stack/docker-compose.yml
+++ b/setup/flavors/stack/docker-compose.yml
@@ -33,7 +33,7 @@ services:
 
   {% if resolver_enabled %}
   resolver:
-    image: mailu/unbound:{{ version }}
+    image: ${DOCKER_ORG:-mailu}/unbound:${MAILU_VERSION:-{{ version }}}
     env_file: {{ env }}
     networks:
       default:
@@ -56,7 +56,6 @@ services:
   imap:
     image: ${DOCKER_ORG:-mailu}/dovecot:${MAILU_VERSION:-{{ version }}}
     env_file: {{ env }}
-    environment:
     volumes:
       - "{{ root }}/mail:/mail"
       - "{{ root }}/overrides:/overrides"
@@ -130,7 +129,7 @@ services:
 
   {% if webmail_type != 'none' %}
   webmail:
-    image: ${DOCKER_ORG:-mailu}/roundcube:${MAILU_VERSION:-{{ version }}}
+    image: ${DOCKER_ORG:-mailu}/{{ webmail_type }}:${MAILU_VERSION:-{{ version }}}
     env_file: {{ env }}
     volumes:
       - "{{ root }}/webmail:/data"