IlyaSobolev/DocSpace-buildtools
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix network creation in 1CI docker

Browse Source
This commit is contained in:
Evgeniy Antonyuk 2023-06-26 12:21:16 +05:00
parent 9336c6614a
commit f79904b8d2
1 changed files with 2 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
build/install/OneClickInstall/install-Docker.sh
View File

@ -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