From 3249e4a99fbe6723b6e19455fed11e751c0618db Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 29 Aug 2023 16:24:36 +0500 Subject: [PATCH 1/4] Fix problem when pulling images in OCI docker --- build/install/OneClickInstall/install-Docker.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh index 2fed2f533a..6d04d79a01 100644 --- a/build/install/OneClickInstall/install-Docker.sh +++ b/build/install/OneClickInstall/install-Docker.sh @@ -1262,6 +1262,8 @@ install_elasticsearch () { install_product () { DOCKER_TAG="${DOCKER_TAG:-$(get_available_version ${IMAGE_NAME})}" + reconfigure DOCKER_TAG ${DOCKER_TAG} + [ "${UPDATE}" = "true" ] && LOCAL_CONTAINER_TAG="$(docker inspect --format='{{index .Config.Image}}' ${CONTAINER_NAME} | awk -F':' '{print $2}')" if [ "${UPDATE}" = "true" ] && [ "${LOCAL_CONTAINER_TAG}" != "${DOCKER_TAG}" ]; then @@ -1274,7 +1276,6 @@ install_product () { reconfigure APP_CORE_MACHINEKEY ${APP_CORE_MACHINEKEY} reconfigure APP_CORE_BASE_DOMAIN ${APP_CORE_BASE_DOMAIN} reconfigure APP_URL_PORTAL "${APP_URL_PORTAL:-"http://${PACKAGE_SYSNAME}-proxy:8092"}" - reconfigure DOCKER_TAG ${DOCKER_TAG} [[ -n $EXTERNAL_PORT ]] && sed -i "s/8092:8092/${EXTERNAL_PORT}:8092/g" $BASE_DIR/${PRODUCT}.yml From f9635e0e42ca8e5ac213c3cb80f5d07299ad0156 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Tue, 29 Aug 2023 16:25:03 +0500 Subject: [PATCH 2/4] Add dependency installation at domain check in OCI docker --- .../install/OneClickInstall/install-Docker.sh | 20 +++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh index 6d04d79a01..2b25011270 100644 --- a/build/install/OneClickInstall/install-Docker.sh +++ b/build/install/OneClickInstall/install-Docker.sh @@ -867,6 +867,26 @@ read_continue_installation () { } domain_check () { + if ! command_exists dig; then + install_service dig dnsutils + fi + + if ! command_exists ping; then + if command_exists apt-get; then + install_service ping iputils-ping + elif command_exists yum; then + install_service ping iputils + fi + fi + + if ! command_exists ip; then + if command_exists apt-get; then + install_service ip iproute2 + elif command_exists yum; then + install_service ip iproute + fi + fi + DOMAINS=$(dig +short -x $(curl -s ifconfig.me) | sed 's/\.$//') if [[ -n "$DOMAINS" ]]; then From 92db0abdf20dd313423cb148a9374b396eb2117c Mon Sep 17 00:00:00 2001 From: sk81biz Date: Tue, 29 Aug 2023 16:38:13 +0300 Subject: [PATCH 3/4] Fix map for service_client --- .../docker/config/nginx/templates/upstream.conf.template | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/build/install/docker/config/nginx/templates/upstream.conf.template b/build/install/docker/config/nginx/templates/upstream.conf.template index f88d9ef1ac..54e70d9b2a 100644 --- a/build/install/docker/config/nginx/templates/upstream.conf.template +++ b/build/install/docker/config/nginx/templates/upstream.conf.template @@ -71,3 +71,9 @@ map "$DOCUMENT_SERVER_URL_EXTERNAL" "$document_server" { default "$DOCUMENT_SERVER_URL_EXTERNAL"; "" "http://$DOCUMENT_CONTAINER_NAME"; } + +map $SERVICE_CLIENT $service_client { + volatile; + "" 127.0.0.1:5001; + default $SERVICE_CLIENT; +} From 99e2e7e0c917a2d1e3a90144d8186f662772164d Mon Sep 17 00:00:00 2001 From: Viktor Fomin Date: Tue, 29 Aug 2023 17:32:10 +0300 Subject: [PATCH 4/4] Client: PortalSettings: Integration: hide services --- .../integration/ThirdPartyServicesSettings/index.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js index 86c50141fa..e02fccd881 100644 --- a/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js +++ b/packages/client/src/pages/PortalSettings/categories/integration/ThirdPartyServicesSettings/index.js @@ -164,7 +164,9 @@ class ThirdPartyServices extends React.Component { (consumer) => consumer.title !== "Bitly" && consumer.title !== "WordPress" && - consumer.title !== "DocuSign" + consumer.title !== "DocuSign" && + consumer.name !== "clickatell" && //TODO: hide while 2fa by sms is not working + consumer.name !== "twilio" ); const imgSrc = theme.isBase ? IntegrationSvgUrl : IntegrationDarkSvgUrl;