From 434d4a178b983b3f13a7df6c03c41a87824b8734 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Tue, 16 Oct 2018 08:19:03 +0200
Subject: [PATCH] ci: commit changes before tagging

---
 Caddyfile |  0
 Makefile  | 20 ++++++++++----------
 2 files changed, 10 insertions(+), 10 deletions(-)
 create mode 100644 Caddyfile

diff --git a/Caddyfile b/Caddyfile
new file mode 100644
index 0000000..e69de29
diff --git a/Makefile b/Makefile
index 66a4f51..a32972c 100644
--- a/Makefile
+++ b/Makefile
@@ -1,4 +1,4 @@
-docker_repo := zokradonh
+docker_repo := kopano
 docker_login := `cat ~/.docker-account-user`
 docker_pwd := `cat ~/.docker-account-pwd`
 
@@ -49,17 +49,17 @@ publish: git-commit repo-login publish-base publish-core publish-webapp
 	git push
 	git push origin --tags
 
+publish-container: component ?= base
+publish-container:
+	@echo 'publish latest to $(docker_repo)/kopano_$(component)'
+	docker push $(docker_repo)/kopano_$(component):$($(component)_version}
+	docker push $(docker_repo)/kopano_$(component):latest
+
 publish-base: build-base tag-base
-	@echo 'publish latest to $(docker_repo)/kopano_base'
-	docker push $(docker_repo)/kopano_base:${base_version}
-	docker push $(docker_repo)/kopano_base:latest
+	component=base make publish-container
 
 publish-core: build-core tag-core
-	@echo 'publish latest to $(docker_repo)/kopano_core'
-	docker push $(docker_repo)/kopano_core:${core_version}
-	docker push $(docker_repo)/kopano_core:latest
+	component=core make publish-container
 
 publish-webapp: build-webapp tag-webapp
-	@echo 'publish latest to $(docker_repo)/kopano_webapp'
-	docker push $(docker_repo)/kopano_webapp:${webapp_version}
-	docker push $(docker_repo)/kopano_webapp:latest
+	component=webapp make publish-container