From 39753af2f00ff6154b52132a1f6e97217bbdd6ce Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Wed, 10 Apr 2024 14:26:07 +0700 Subject: [PATCH] Move package version hold to OCI script for postinst issues (#196) --- .../OneClickInstall/install-Debian/install-app.sh | 2 ++ install/OneClickInstall/install-Debian/tools.sh | 12 ++++++++++++ install/common/product-configuration | 14 -------------- 3 files changed, 14 insertions(+), 14 deletions(-) diff --git a/install/OneClickInstall/install-Debian/install-app.sh b/install/OneClickInstall/install-Debian/install-app.sh index 9427847a31..a0d14b169d 100644 --- a/install/OneClickInstall/install-Debian/install-app.sh +++ b/install/OneClickInstall/install-Debian/install-app.sh @@ -85,6 +85,8 @@ elif [ "$UPDATE" = "true" ] && [ "$PRODUCT_INSTALLED" = "true" ]; then fi fi +hold_package_version dotnet-host opensearch redis-server rabbitmq-server + if [ "$MAKESWAP" == "true" ]; then make_swap fi diff --git a/install/OneClickInstall/install-Debian/tools.sh b/install/OneClickInstall/install-Debian/tools.sh index ef92367e7c..35ea566aed 100644 --- a/install/OneClickInstall/install-Debian/tools.sh +++ b/install/OneClickInstall/install-Debian/tools.sh @@ -24,6 +24,18 @@ command_exists () { type "$1" &> /dev/null; } +# Function to prevent package auto-update +hold_package_version() { + for package in "$@"; do + if command -v apt-mark >/dev/null 2>&1 && + dpkg -s "$package" >/dev/null 2>&1 && + ! apt-mark showhold | grep -q "$package" >/dev/null 2>&1 + then + apt-mark hold "$package" + fi + done +} + check_hardware () { DISK_REQUIREMENTS=40960; MEMORY_REQUIREMENTS=8000; diff --git a/install/common/product-configuration b/install/common/product-configuration index 768f64933b..efd594ef39 100644 --- a/install/common/product-configuration +++ b/install/common/product-configuration @@ -780,16 +780,6 @@ check_connection_external_services() { return $HOST_RESPONCE } -# Function to prevent package auto-update -hold_package_version(){ - if command -v apt >/dev/null 2>&1 && - dpkg -s $1 >/dev/null 2>&1 && - ! apt-mark showhold | grep -q $1 >/dev/null 2>&1 - then - apt-mark hold $1 >/dev/null 2>&1 - fi -} - if command -v yum >/dev/null 2>&1; then DIST="RedHat" PACKAGE_MANAGER="rpm -q" @@ -802,7 +792,6 @@ elif command -v apt >/dev/null 2>&1; then MYSQL_PACKAGE="mysql" REDIS_PACKAGE="redis-server" SYSTEMD_DIR="$(dirname $(dpkg-query -L ${PRODUCT}-api | grep systemd/system/))" - hold_package_version dotnet-host fi install_json @@ -831,7 +820,6 @@ if [[ ! -z $EXTERNAL_ELK_FLAG ]]; then setup_elasticsearch "EXTERNAL_ELASTIC_SERVER" elif $PACKAGE_MANAGER opensearch >/dev/null 2>&1; then setup_elasticsearch "LOCAL_ELASTIC_SERVER" - hold_package_version opensearch fi if [[ ! -z $EXTERNAL_REDIS_FLAG ]]; then @@ -839,7 +827,6 @@ if [[ ! -z $EXTERNAL_REDIS_FLAG ]]; then setup_redis "EXTERNAL_REDIS_SERVER" elif $PACKAGE_MANAGER $REDIS_PACKAGE >/dev/null 2>&1; then setup_redis "LOCAL_REDIS_SERVER" - hold_package_version $REDIS_PACKAGE fi if [[ ! -z $EXTERNAL_RABBITMQ_FLAG ]]; then @@ -847,7 +834,6 @@ if [[ ! -z $EXTERNAL_RABBITMQ_FLAG ]]; then setup_rabbitmq "EXTERNAL_RABBITMQ_SERVER" elif $PACKAGE_MANAGER rabbitmq-server >/dev/null 2>&1; then setup_rabbitmq "LOCAL_RABBITMQ_SERVER" - hold_package_version rabbitmq-server fi restart_services