From 5dd163467dc5a1c846bf22a859d9e0c30be3295a Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Fri, 10 May 2019 20:30:37 +0200
Subject: [PATCH] Add tag to kopano_ssl image (#152)

switch kopano_ssl from apline:latest to alpine:3.9
add tagging and publishing of tag to Makefile
update version of Konnect and Kweb since they have been update meanwhile
---
 Makefile           | 9 +++++++--
 konnect/Dockerfile | 2 +-
 ssl/Dockerfile     | 3 ++-
 web/Dockerfile     | 2 +-
 4 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/Makefile b/Makefile
index 56dc68c..bff6390 100644
--- a/Makefile
+++ b/Makefile
@@ -208,6 +208,11 @@ tag-scheduler:
 	$(shell docker run --rm $(docker_repo)/kopano_scheduler env | grep SUPERCRONIC_VERSION | cut -d'=' -f2))
 	component=scheduler make tag-container
 
+tag-ssl:
+	$(eval ssl_version := \
+	$(shell docker run --rm $(docker_repo)/kopano_ssl env | grep CODE_VERSION | cut -d'=' -f2))
+	component=ssl make tag-container
+
 tag-utils:
 	$(eval utils_version := \
 	$(shell docker run --rm $(docker_repo)/kopano_utils cat /kopano/buildversion | cut -d- -f2))
@@ -279,8 +284,8 @@ publish-kdav: build-kdav #tag-kdav
 publish-scheduler: build-scheduler tag-scheduler
 	component=scheduler make publish-container
 
-publish-ssl: build-ssl
-	docker push $(docker_repo)/kopano_ssl:latest
+publish-ssl: build-ssl tag-ssl
+	component=scheduler make publish-container
 
 publish-utils: build-core build-utils tag-utils
 	component=utils make publish-container
diff --git a/konnect/Dockerfile b/konnect/Dockerfile
index d484d52..5ff7e20 100644
--- a/konnect/Dockerfile
+++ b/konnect/Dockerfile
@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.21.0
+ARG CODE_VERSION=0.23.3
 FROM kopano/konnectd:${CODE_VERSION}
 ARG CODE_VERSION
 ENV CODE_VERSION="${CODE_VERSION}"
diff --git a/ssl/Dockerfile b/ssl/Dockerfile
index f4f0ff7..8bfd784 100644
--- a/ssl/Dockerfile
+++ b/ssl/Dockerfile
@@ -1,4 +1,5 @@
-FROM alpine:latest
+FROM alpine:3.9
+ENV CODE_VERSION=1.0
 
 LABEL maintainer=az@zok.xyz \
       version="1.0"
diff --git a/web/Dockerfile b/web/Dockerfile
index 542fab2..a4a225e 100644
--- a/web/Dockerfile
+++ b/web/Dockerfile
@@ -1,4 +1,4 @@
-ARG CODE_VERSION=0.6.0
+ARG CODE_VERSION=0.6.1
 FROM kopano/kwebd:${CODE_VERSION}
 ARG CODE_VERSION
 ENV CODE_VERSION="${CODE_VERSION}"