From f79904b8d2e1b2c01664636cb9137c6469495c82 Mon Sep 17 00:00:00 2001 From: Evgeniy Antonyuk Date: Mon, 26 Jun 2023 12:21:16 +0500 Subject: [PATCH] Fix network creation in 1CI docker --- build/install/OneClickInstall/install-Docker.sh | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh index c780e4cca7..da60cb4d9e 100644 --- a/build/install/OneClickInstall/install-Docker.sh +++ b/build/install/OneClickInstall/install-Docker.sh @@ -41,7 +41,7 @@ INSTALLATION_TYPE="ENTERPRISE" IMAGE_NAME="${PACKAGE_SYSNAME}/${PRODUCT}-api" CONTAINER_NAME="${PACKAGE_SYSNAME}-api" -NETWORK=${PACKAGE_SYSNAME} +NETWORK_NAME=${PACKAGE_SYSNAME} DISK_REQUIREMENTS=40960; MEMORY_REQUIREMENTS=5500; @@ -698,14 +698,6 @@ docker_login () { fi } -create_network () { - EXIST=$(docker network ls | awk '{print $2;}' | { grep -x ${NETWORK} || true; }); - - if [[ -z ${EXIST} ]]; then - docker network create --driver bridge ${NETWORK} - fi -} - get_container_env_parameter () { local CONTAINER_NAME=$1; local PARAMETER_NAME=$2; @@ -930,6 +922,7 @@ download_files () { reconfigure STATUS ${STATUS} reconfigure INSTALLATION_TYPE ${INSTALLATION_TYPE} + reconfigure NETWORK_NAME ${NETWORK_NAME} reconfigure MYSQL_DATABASE ${MYSQL_DATABASE} reconfigure MYSQL_USER ${MYSQL_USER} @@ -1035,8 +1028,6 @@ start_installation () { set_core_machinekey - create_network - set_mysql_params download_files