From 2afb65303acf891db70d59141cd2d056c6d148b9 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Tue, 25 Feb 2020 13:05:31 +0100
Subject: [PATCH] final changes

Signed-off-by: Felix Bartels <felix@host-consultants.de>
---
 Makefile                | 4 +++-
 base/Dockerfile         | 5 +++--
 docker-compose.mail.yml | 4 ++--
 docker-compose.yml      | 4 ++--
 setup.sh                | 3 +++
 5 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/Makefile b/Makefile
index ba07238..6556b9e 100644
--- a/Makefile
+++ b/Makefile
@@ -280,7 +280,9 @@ publish-container: ## Helper target to push a given image to a registry. Default
 		version=$${version%.*} ; \
 		docker push $(docker_repo)/kopano_$(component):$$version ; \
 	done
-	#docker push $(docker_repo)/kopano_$(component):latest
+ifdef PUBLISHLATEST
+	docker push $(docker_repo)/kopano_$(component):latest
+endif
 #ifdef DOCKERREADME
 #	bash .ci/docker-hub-helper.sh $(component)
 #endif
diff --git a/base/Dockerfile b/base/Dockerfile
index 116071c..6bd97f5 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -12,7 +12,8 @@ ARG RELEASE_KEY_DOWNLOAD=0
 ARG KOPANO_UID=999
 ARG KOPANO_GID=999
 
-ENV BASE_VERSION=2.0.0 \
+ENV \
+    BASE_VERSION=2.0.0 \
     DEBUG="" \
     DEBIAN_FRONTEND=noninteractive
 
@@ -87,4 +88,4 @@ ONBUILD RUN \
     . /kopano/helper/create-kopano-repo.sh && \
     if [ ${DOWNLOAD_COMMUNITY_PACKAGES} -eq 1 ]; then \
         dl_and_package_community "core" "$DOWNLOAD_DISTRIBUTION" "$DOWNLOAD_CHANNEL" "$DOWNLOAD_BRANCH"; \
-    fi
\ No newline at end of file
+    fi
diff --git a/docker-compose.mail.yml b/docker-compose.mail.yml
index d34a285..342479f 100644
--- a/docker-compose.mail.yml
+++ b/docker-compose.mail.yml
@@ -4,8 +4,8 @@ services:
   mail:
     image: tvial/docker-mailserver:release-v6.2.0
     restart: unless-stopped
-    #hostname: mail
-    #domainname: ${LDAP_DOMAIN}
+    hostname: mail
+    domainname: ${LDAP_DOMAIN}
     container_name: ${COMPOSE_PROJECT_NAME}_mail
     ports:
       - "${SMTPPORT:-25}:25"
diff --git a/docker-compose.yml b/docker-compose.yml
index 5891a02..2bea9ec 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -257,8 +257,8 @@ services:
     image: ${docker_repo:-zokradonh}/kopano_core:${CORE_VERSION:-latest}
     read_only: true
     restart: unless-stopped
-    #hostname: spooler
-    #domainname: ${LDAP_DOMAIN}
+    hostname: spooler
+    domainname: ${LDAP_DOMAIN}
     depends_on:
       - kopano_server
     volumes:
diff --git a/setup.sh b/setup.sh
index f807038..593178c 100755
--- a/setup.sh
+++ b/setup.sh
@@ -339,6 +339,9 @@ COMPOSE_FILE=docker-compose.yml:docker-compose.ports.yml:docker-compose.db.yml:d
 #RELEASE_KEY_DOWNLOAD=1
 #DOWNLOAD_COMMUNITY_PACKAGES=0
 
+# Remove this variable to not push versioned containers with the :latest tag
+PUBLISHLATEST=yes
+
 # Additional packages to install
 ADDITIONAL_KOPANO_PACKAGES=""
 ADDITIONAL_KOPANO_WEBAPP_PLUGINS="$ADDITIONAL_KOPANO_WEBAPP_PLUGINS"