From 0f98176282fbc89f68541a39822663b54898d508 Mon Sep 17 00:00:00 2001 From: Felix Bartels Date: Thu, 9 May 2019 13:11:45 +0200 Subject: [PATCH] do not upgrade dependencies when installing additional dependencies (#151) this would otherwise alter other files in the image (e.g. upgrade z-push from 2.4.5 to 2.5.0). the more sustainable approach is to bake additional packages directly into the container by building an own through the makefile. Signed-off-by: Felix Bartels --- core/start-service.sh | 2 +- webapp/start.sh | 2 +- zpush/start.sh | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/start-service.sh b/core/start-service.sh index 7a5d456..0811807 100755 --- a/core/start-service.sh +++ b/core/start-service.sh @@ -14,7 +14,7 @@ fi [ -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 5159e3b..b99672e 100755 --- a/webapp/start.sh +++ b/webapp/start.sh @@ -17,7 +17,7 @@ ADDITIONAL_KOPANO_PACKAGES="$ADDITIONAL_KOPANO_PACKAGES $ADDITIONAL_KOPANO_WEBAP [ -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/zpush/start.sh b/zpush/start.sh index e5cf0bc..e93e275 100755 --- a/zpush/start.sh +++ b/zpush/start.sh @@ -41,7 +41,7 @@ php_cfg_gen() { [ -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