From ed5f176fecc23ccd59b0844cad1d490ea035f093 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 30 Jun 2023 20:25:04 +0400 Subject: [PATCH 1/2] Build: Docker dev: refactroing --- build/build.backend.docker.sh | 11 ----------- 1 file changed, 11 deletions(-) diff --git a/build/build.backend.docker.sh b/build/build.backend.docker.sh index dfd7e93442..8defff5a97 100755 --- a/build/build.backend.docker.sh +++ b/build/build.backend.docker.sh @@ -9,17 +9,6 @@ echo "Root directory:" $dir cd $dir -branch=$(git branch --show-current) - -echo "GIT_BRANCH:" $branch - -branch_exist_remote=$(git ls-remote --heads origin $branch) - -if [ -z "$branch_exist_remote" ]; then - echo "The current branch does not exist in the remote repository. Please push changes." - exit 1 -fi - cd $dir/build/install/docker/ docker_dir="$( pwd )" From 91a0f2c7ffa20f8571dd7d673b75e39e6cff4d11 Mon Sep 17 00:00:00 2001 From: Alexey Safronov Date: Fri, 30 Jun 2023 20:26:50 +0400 Subject: [PATCH 2/2] Build: Docker dev: Fix start script --- build/start/start.backend.docker.sh | 40 ++++++++--------------------- 1 file changed, 10 insertions(+), 30 deletions(-) diff --git a/build/start/start.backend.docker.sh b/build/start/start.backend.docker.sh index a3a02b6be7..4cd311bb6b 100755 --- a/build/start/start.backend.docker.sh +++ b/build/start/start.backend.docker.sh @@ -7,29 +7,12 @@ dir=$(builtin cd $rd/../../; pwd) echo "Root directory:" $dir -cd $dir - -branch=$(git branch --show-current) - -echo "GIT_BRANCH:" $branch - -branch_exist_remote=$(git ls-remote --heads origin $branch) - -if [ -z "$branch_exist_remote" ]; then - echo "The current branch does not exist in the remote repository. Please push changes." - exit 1 -fi - cd $dir/build/install/docker/ docker_dir="$( pwd )" echo "Docker directory:" $docker_dir -build_date=$(date +%Y-%m-%d) - -echo "BUILD DATE: $build_date" - local_ip=$(ipconfig getifaddr en0) echo "LOCAL IP: $local_ip" @@ -42,19 +25,16 @@ echo "SERVICE_DOCEDITOR: $doceditor" echo "SERVICE_LOGIN: $login" echo "SERVICE_CLIENT: $client" -docker_file=Dockerfile.dev -env_extension="dev" -core_base_domain="localhost" - -echo "Start all backend services (containers)" -DOCKERFILE=$docker_file \ -ROOT_DIR=$dir \ -RELEASE_DATE=$build_date \ -GIT_BRANCH=$branch \ +Baseimage_Dotnet_Run="onlyoffice/4testing-docspace-dotnet-runtime:v1.0.0" \ +Baseimage_Nodejs_Run="onlyoffice/4testing-docspace-nodejs-runtime:v1.0.0" \ +Baseimage_Proxy_Run="onlyoffice/4testing-docspace-proxy-runtime:v1.0.0" \ +BUILD_PATH="/var/www" \ +SRC_PATH="$dir/publish/services" \ SERVICE_DOCEDITOR=$doceditor \ SERVICE_LOGIN=$login \ SERVICE_CLIENT=$client \ -APP_CORE_BASE_DOMAIN=$core_base_domain \ -APP_URL_PORTAL="http://$local_ip:8092" \ -ENV_EXTENSION=$env_extension \ -docker compose -f docspace.dev.yml up -d \ No newline at end of file +ROOT_DIR=$dir \ +DATA_DIR="$dir/Data" \ +ENV_EXTENSION="dev" \ +DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/documentserver-de:latest \ +docker-compose -f docspace.profiles.yml -f docspace.overcome.yml --profile backend-local up -d \ No newline at end of file