From d6c3896b4e12aaa5082b6cc3a80e89f4e0b90b6a Mon Sep 17 00:00:00 2001
From: engelant <mumie_die@yahoo.de>
Date: Tue, 1 Sep 2020 11:55:10 +0200
Subject: [PATCH] Fix kapps version (#436)

* Added KAPPS_VERSION
The KAPPS_VERSION didin't match the CORE_VERSION execept for latest.
A new KAAPS_VERSION var in the .env, which defaults to latest, will fix this.

Co-authored-by: Anton Engelhardt <anton@neednow.de>
Co-authored-by: Felix Bartels <1257835+fbartels@users.noreply.github.com>
---
 docker-compose.yml | 2 +-
 setup.sh           | 5 +++++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 49d761a..0eb063a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -220,7 +220,7 @@ services:
       - /tmp
 
   kopano_kapps:
-    image: ${docker_repo:-zokradonh}/kopano_kapps:${CORE_VERSION:-latest}
+    image: ${docker_repo:-zokradonh}/kopano_kapps:${KAPPS_VERSION:-latest}
     read_only: true
     restart: unless-stopped
     environment:
diff --git a/setup.sh b/setup.sh
index 05ce146..6b50ce8 100755
--- a/setup.sh
+++ b/setup.sh
@@ -84,6 +84,10 @@ if [ ! -e ./.env ]; then
 	read -r -p "Which tag do you want to use for Kopano Konnect? [$value_default]: " new_value
 	KONNECT_VERSION=${new_value:-$value_default}
 
+	value_default=latest
+	read -r -p "Which tag do you want to use for Kopano Kapps? [$value_default]: " new_value
+	KAPPS_VERSION=${new_value:-$value_default}
+
 	value_default=latest
 	read -r -p "Which tag do you want to use for Kopano Kwmserver? [$value_default]: " new_value
 	KWM_VERSION=${new_value:-$value_default}
@@ -268,6 +272,7 @@ KONNECT_VERSION=$KONNECT_VERSION
 KWM_VERSION=$KWM_VERSION
 MEET_VERSION=$MEET_VERSION
 KDAV_VERSION=$KDAV_VERSION
+KAPPS_VERSION=$KAPPS_VERSION
 
 LDAP_CONTAINER=$LDAP_CONTAINER
 LDAP_ORGANISATION="$LDAP_ORGANISATION"