final changes

Signed-off-by: Felix Bartels <felix@host-consultants.de>

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

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
+    fi

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"

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:

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"