From 26c45ce1dbe79b2f23c6b2fe11118f084097bc73 Mon Sep 17 00:00:00 2001
From: Felix Bartels <felix@host-consultants.de>
Date: Wed, 28 Aug 2019 20:49:31 +0200
Subject: [PATCH] cut quotes from additional package var earlier on (#224)

* cut quotes from additional package var earlier on
* add easy debugging switch to script and predefine env var in base image
---
 base/Dockerfile       | 3 ++-
 core/start-service.sh | 5 +++--
 kdav/start.sh         | 4 +++-
 webapp/start.sh       | 4 +++-
 zpush/start.sh        | 4 +++-
 5 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/base/Dockerfile b/base/Dockerfile
index 2cf5151..ac8fbb6 100644
--- a/base/Dockerfile
+++ b/base/Dockerfile
@@ -9,7 +9,8 @@ ARG KOPANO_REPOSITORY_FLAGS="trusted=yes"
 ARG RELEASE_KEY_DOWNLOAD=0
 ARG DEBIAN_FRONTEND=noninteractive
 
-ENV BASE_VERSION=1.2.0
+ENV BASE_VERSION=1.2.1 \
+    DEBUG=""
 
 LABEL maintainer=az@zok.xyz \
     org.label-schema.name="Kopano base container" \
diff --git a/core/start-service.sh b/core/start-service.sh
index 9677942..169faac 100755
--- a/core/start-service.sh
+++ b/core/start-service.sh
@@ -4,15 +4,16 @@ ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
 KCCONF_SERVER_MYSQL_SOCKET=${KCCONF_SERVER_MYSQL_SOCKET:-""}
 
 set -eu # unset variables are errors & non-zero return values exit the whole script
+[ "$DEBUG" ] && set -x
 
 if [ ! -e /kopano/"$SERVICE_TO_START".py ]; then
 	echo "Invalid service specified: $SERVICE_TO_START" | ts
 	exit 1
 fi
 
-# TODO this needs fixing as now apt update is always salled (since the value is at least "")
+ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"')
 [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update
-[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"'); do
+[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
 	# shellcheck disable=SC2016 disable=SC2086
 	if [ "$(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c 'ok installed')" -eq 0 ]; then
 		apt --assume-yes --no-upgrade install "$installpkg"
diff --git a/kdav/start.sh b/kdav/start.sh
index fc5f658..a481801 100755
--- a/kdav/start.sh
+++ b/kdav/start.sh
@@ -6,12 +6,14 @@ KCCONF_SERVERPORT=${KCCONF_SERVERPORT:-236}
 ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
 
 set -eu # unset variables are errors & non-zero return values exit the whole script
+[ "$DEBUG" ] && set -x
 
+ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"')
 [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update
 [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
 	# shellcheck disable=SC2016 disable=SC2086
 	if [ "$(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c 'ok installed')" -eq 0 ]; then
-		apt --assume-yes install "$installpkg"
+		apt --assume-yes --no-upgrade install "$installpkg"
 	fi
 done
 
diff --git a/webapp/start.sh b/webapp/start.sh
index baad625..f79aff4 100755
--- a/webapp/start.sh
+++ b/webapp/start.sh
@@ -7,14 +7,16 @@ ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
 ADDITIONAL_KOPANO_WEBAPP_PLUGINS=${ADDITIONAL_KOPANO_WEBAPP_PLUGINS:-""}
 
 set -eu # unset variables are errors & non-zero return values exit the whole script
+[ "$DEBUG" ] && set -x
 
 # shellcheck source=php/start-helper.sh
 source /kopano/start-helper.sh
 
 ADDITIONAL_KOPANO_PACKAGES="$ADDITIONAL_KOPANO_PACKAGES $ADDITIONAL_KOPANO_WEBAPP_PLUGINS"
 
+ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"')
 [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update
-[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"'); do
+[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
 	# shellcheck disable=SC2016 disable=SC2086
 	if [ "$(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c 'ok installed')" -eq 0 ]; then
 		apt --assume-yes --no-upgrade install "$installpkg"
diff --git a/zpush/start.sh b/zpush/start.sh
index 9640276..686cc8c 100755
--- a/zpush/start.sh
+++ b/zpush/start.sh
@@ -6,6 +6,7 @@ KCCONF_SERVERPORT=${KCCONF_SERVERPORT:-236}
 ADDITIONAL_KOPANO_PACKAGES=${ADDITIONAL_KOPANO_PACKAGES:-""}
 
 set -eu # unset variables are errors & non-zero return values exit the whole script
+[ "$DEBUG" ] && set -x
 
 php_cfg_gen() {
 	local cfg_file="$1"
@@ -37,8 +38,9 @@ php_cfg_gen() {
 	fi
 }
 
+ADDITIONAL_KOPANO_PACKAGES=$(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"')
 [ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && apt update
-[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $(echo "$ADDITIONAL_KOPANO_PACKAGES" | tr -d '"'); do
+[ -n "${ADDITIONAL_KOPANO_PACKAGES// }" ] && for installpkg in $ADDITIONAL_KOPANO_PACKAGES; do
 	# shellcheck disable=SC2016 disable=SC2086
 	if [ "$(dpkg-query -W -f='${Status}' $installpkg 2>/dev/null | grep -c 'ok installed')" -eq 0 ]; then
 		apt --assume-yes --no-upgrade install "$installpkg"