From c0ccfb0a6a43f7a3cf2175979e986e200e5f9784 Mon Sep 17 00:00:00 2001 From: Ilya Oleshko Date: Mon, 2 Oct 2023 17:14:17 +0300 Subject: [PATCH] Fixed scripts on windows --- build.backend.docker.ps1 | 2 +- build.document.server.docker.ps1 | 2 +- clear.backend.docker.ps1 | 2 +- install/common/build-services.ps1 | 10 ++++---- install/docker/docspace.overcome.yml | 34 ++++++++++++++-------------- install/docker/docspace.profiles.yml | 3 ++- start/start.backend.docker.ps1 | 2 +- 7 files changed, 28 insertions(+), 27 deletions(-) diff --git a/build.backend.docker.ps1 b/build.backend.docker.ps1 index 3402cc37fc..de7b87cebc 100644 --- a/build.backend.docker.ps1 +++ b/build.backend.docker.ps1 @@ -84,7 +84,7 @@ $Env:SERVICE_CLIENT=$Client $Env:ROOT_DIR=$RootDir $Env:BUILD_PATH="/var/www" $Env:SRC_PATH="$RootDir\publish\services" -$Env:DATA_DIR="$RootDir\Data" +$Env:DATA_DIR="$RootDir\data" $Env:APP_URL_PORTAL=$PortalUrl docker compose -f "$DockerDir\docspace.profiles.yml" -f "$DockerDir\docspace.overcome.yml" --profile migration-runner --profile backend-local up -d diff --git a/build.document.server.docker.ps1 b/build.document.server.docker.ps1 index 5c3b4548dc..cb9f67f196 100644 --- a/build.document.server.docker.ps1 +++ b/build.document.server.docker.ps1 @@ -12,4 +12,4 @@ Write-Host "Run Document server" -ForegroundColor Green $DOCUMENT_SERVER_IMAGE_NAME = "onlyoffice/documentserver-de:latest" -docker run -i -t -d -p 8085:80 -e JWT_ENABLED=true -e JWT_SECRET=secret -e JWT_HEADER=AuthorizationJwt --restart=always -v $RootDir/Data:/var/www/onlyoffice/Data $DOCUMENT_SERVER_IMAGE_NAME \ No newline at end of file +docker run -i -t -d -p 8085:80 -e JWT_ENABLED=true -e JWT_SECRET=secret -e JWT_HEADER=AuthorizationJwt --restart=always -v $RootDir/data:/var/www/onlyoffice/Data $DOCUMENT_SERVER_IMAGE_NAME \ No newline at end of file diff --git a/clear.backend.docker.ps1 b/clear.backend.docker.ps1 index 77f172f270..de6f9a2dfd 100644 --- a/clear.backend.docker.ps1 +++ b/clear.backend.docker.ps1 @@ -16,7 +16,7 @@ if ($Containers -or $Images) { $Env:BUILD_PATH="/var/www" $Env:SRC_PATH="$RootDir\publish\services" $Env:ROOT_DIR=$RootDir - $Env:DATA_DIR="$RootDir\Data" + $Env:DATA_DIR="$RootDir\data" docker compose -f "$DockerDir\docspace.profiles.yml" -f "$DockerDir\docspace.overcome.yml" --profile "migration-runner" --profile "backend-local" down --volumes diff --git a/install/common/build-services.ps1 b/install/common/build-services.ps1 index 1528ae49f4..8d6542d7c0 100644 --- a/install/common/build-services.ps1 +++ b/install/common/build-services.ps1 @@ -18,10 +18,10 @@ if(Test-Path -Path "$BUILD_PATH\services" ){ } Write-Host "== Build ASC.Web.slnf ==" -ForegroundColor Green -dotnet build "$SRC_PATH\ASC.Web.slnf" +dotnet build "$SRC_PATH\server\ASC.Web.slnf" Write-Host "== Build ASC.Migrations.sln ==" -ForegroundColor Green -dotnet build "$SRC_PATH\ASC.Migrations.sln" -o "$BUILD_PATH\services\ASC.Migration.Runner\service\" +dotnet build "$SRC_PATH\server\ASC.Migrations.sln" -o "$BUILD_PATH\services\ASC.Migration.Runner\service\" Write-Host "== Add docker-migration-entrypoint.sh to ASC.Migration.Runner ==" -ForegroundColor Green $FilePath = "$BUILD_PATH\services\ASC.Migration.Runner\service\docker-migration-entrypoint.sh" @@ -30,7 +30,7 @@ Get-Content "$SRC_PATH\build\install\docker\docker-migration-entrypoint.sh" -raw foreach ($SERVICE in $BACKEND_NODEJS_SERVICES) { Write-Host "== Build $SERVICE project ==" -ForegroundColor Green - yarn install --cwd "$SRC_PATH\common\$SERVICE" --frozen-lockfile + yarn install --cwd "$SRC_PATH\server\common\$SERVICE" --frozen-lockfile $DST = "$BUILD_PATH\services\$SERVICE\service\" @@ -39,13 +39,13 @@ foreach ($SERVICE in $BACKEND_NODEJS_SERVICES) } Write-Host "== Copy service data to `publish\services\${SERVICE}\service` ==" -ForegroundColor Green - Copy-Item -Path "$SRC_PATH\common\$SERVICE\*" -Destination $DST -Recurse + Copy-Item -Path "$SRC_PATH\server\common\$SERVICE\*" -Destination $DST -Recurse Write-Host "== Add docker-entrypoint.py to $SERVICE ==" -ForegroundColor Green Copy-Item $DOCKER_ENTRYPOINT -Destination $DST } Write-Host "== Publish ASC.Web.slnf ==" -ForegroundColor Green -dotnet publish "$SRC_PATH\ASC.Web.slnf" -p "PublishProfile=FolderProfile" +dotnet publish "$SRC_PATH\server\ASC.Web.slnf" -p "PublishProfile=FolderProfile" Set-Location -Path $PSScriptRoot diff --git a/install/docker/docspace.overcome.yml b/install/docker/docspace.overcome.yml index aa3fbb20c3..35aca148e9 100644 --- a/install/docker/docspace.overcome.yml +++ b/install/docker/docspace.overcome.yml @@ -22,8 +22,8 @@ services: - ${SRC_PATH}/ASC.Data.Backup.BackgroundTasks/service:${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -37,8 +37,8 @@ services: - ${SRC_PATH}/ASC.Data.Backup/service:${BUILD_PATH}/services/ASC.Data.Backup/service/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -51,8 +51,8 @@ services: volumes: - ${SRC_PATH}/ASC.Files/service:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -71,8 +71,8 @@ services: - ${SRC_PATH}/ASC.Files.Service/service:${BUILD_PATH}/products/ASC.Files/service/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -85,8 +85,8 @@ services: volumes: - ${SRC_PATH}/ASC.People/service:${BUILD_PATH}/products/ASC.People/server/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -111,8 +111,8 @@ services: - ${SRC_PATH}/ASC.Studio.Notify/service:${BUILD_PATH}/services/ASC.Studio.Notify/service/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -126,8 +126,8 @@ services: - ${SRC_PATH}/ASC.Web.Api/service:${BUILD_PATH}/studio/ASC.Web.Api/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -141,8 +141,8 @@ services: - ${SRC_PATH}/ASC.Web.Studio/service:${BUILD_PATH}/studio/ASC.Web.Studio/ - ${SRC_PATH}/ASC.Files/service/:${BUILD_PATH}/products/ASC.Files/server/ - ${SRC_PATH}/ASC.People/service/:${BUILD_PATH}/products/ASC.People/server/ - - ${ROOT_DIR}/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json - - ${ROOT_DIR}/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/build/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully @@ -171,7 +171,7 @@ services: environment: - SERVICE_CLIENT=${SERVICE_CLIENT} volumes: - - ${ROOT_DIR}/public:/var/www/public/ + - ${ROOT_DIR}/client/public:/var/www/public/ onlyoffice-rabbitmq: <<: *x-profiles-local diff --git a/install/docker/docspace.profiles.yml b/install/docker/docspace.profiles.yml index 5e040ff0de..0787ca1594 100644 --- a/install/docker/docspace.profiles.yml +++ b/install/docker/docspace.profiles.yml @@ -58,7 +58,8 @@ x-service: &x-service-base RABBIT_PASSWORD: ${RABBIT_PASSWORD} ROUTER_HOST: ${ROUTER_HOST} volumes: - - ${ROOT_DIR}/Data:/app/onlyoffice/data + - ${ROOT_DIR}/data:/app/onlyoffice/data + - ${ROOT_DIR}/logs:/var/log/onlyoffice - files_data:/var/www/products/ASC.Files/server/ - people_data:/var/www/products/ASC.People/server/ diff --git a/start/start.backend.docker.ps1 b/start/start.backend.docker.ps1 index 2a4eeb5324..fdf9bda954 100644 --- a/start/start.backend.docker.ps1 +++ b/start/start.backend.docker.ps1 @@ -28,5 +28,5 @@ $Env:SERVICE_CLIENT=$Client $Env:ROOT_DIR=$RootDir $Env:BUILD_PATH="/var/www" $Env:SRC_PATH="$RootDir\publish\services" -$Env:DATA_DIR="$RootDir\Data" +$Env:DATA_DIR="$RootDir\data" docker compose -f docspace.profiles.yml -f docspace.overcome.yml --profile migration-runner --profile backend-local start \ No newline at end of file