From d50b3aba50681cc483e0900349242f769b528a2d Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 2 Apr 2024 19:09:30 +0700 Subject: [PATCH 1/2] Add pending migration-runner completion (#189) --- install/OneClickInstall/install-Docker.sh | 1 + 1 file changed, 1 insertion(+) diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh index 6184c3f7b9..5678b7dcd5 100644 --- a/install/OneClickInstall/install-Docker.sh +++ b/install/OneClickInstall/install-Docker.sh @@ -1304,6 +1304,7 @@ install_product () { reconfigure EXTERNAL_PORT ${EXTERNAL_PORT} docker-compose -f $BASE_DIR/migration-runner.yml up -d + docker wait ${PACKAGE_SYSNAME}-migration-runner docker-compose -f $BASE_DIR/${PRODUCT}.yml up -d docker-compose -f ${PROXY_YML} up -d docker-compose -f $BASE_DIR/notify.yml up -d From 564aa17350b57b8c94197f565063609a5b269aff Mon Sep 17 00:00:00 2001 From: Elbakyan Shirak Date: Tue, 2 Apr 2024 19:04:37 +0400 Subject: [PATCH 2/2] Fix opensearch plugin removal (#191) --- install/common/product-configuration | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/install/common/product-configuration b/install/common/product-configuration index 28f1c6ec4b..768f64933b 100644 --- a/install/common/product-configuration +++ b/install/common/product-configuration @@ -619,7 +619,9 @@ change_elasticsearch_config(){ sed -i '/^plugins\.security/d' /etc/opensearch/opensearch.yml sed -i '/CN=kirk,OU=client,O=client,L=test, C=de/d' /etc/opensearch/opensearch.yml - /usr/share/opensearch/bin/opensearch-plugin remove opensearch-security + if /usr/share/opensearch/bin/opensearch-plugin list | grep -x "opensearch-security" > /dev/null 2>&1 ; then + /usr/share/opensearch/bin/opensearch-plugin remove opensearch-security > /dev/null 2>&1 + fi local ELASTIC_SEARCH_CONF_PATH="/etc/opensearch/opensearch.yml" local ELASTIC_SEARCH_JAVA_CONF_PATH="/etc/opensearch/jvm.options";