diff --git a/build.backend.docker.sh b/build.backend.docker.sh index 870bc2dc7e..248b630f28 100755 --- a/build.backend.docker.sh +++ b/build.backend.docker.sh @@ -4,7 +4,7 @@ rd="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" echo "Run script directory:" $dir dir=$(builtin cd $rd/../; pwd) -dockerDir="$dir/build/install/docker" +dockerDir="$dir/buildtools/install/docker" echo "Root directory:" $dir echo "Docker files root directory:" $dockerDir @@ -32,7 +32,7 @@ fi echo "FORCE BUILD BASE IMAGES: $force" # Stop all backend services" -$dir/build/start/stop.backend.docker.sh +$dir/buildtools/start/stop.backend.docker.sh echo "Run MySQL" @@ -60,7 +60,7 @@ echo "Clear publish folder" rm -rf $dir/publish/services echo "Build backend services (to "publish/" folder)" -bash $dir/build/install/common/build-services.sh -pb backend-publish -pc Debug -de "$dockerDir/docker-entrypoint.py" +bash $dir/buildtools/install/common/build-services.sh -pb backend-publish -pc Debug -de "$dockerDir/docker-entrypoint.py" dotnet_version=dev @@ -68,7 +68,7 @@ exists=$(docker images | egrep "onlyoffice/4testing-docspace-dotnet-runtime" | e if [ "${exists}" = "" ] || [ "$force" = true ]; then echo "Build dotnet base image from source (apply new dotnet config)" - docker build -t onlyoffice/4testing-docspace-dotnet-runtime:$dotnet_version -f ./build/install/docker/Dockerfile.runtime --target dotnetrun . + docker build -t onlyoffice/4testing-docspace-dotnet-runtime:$dotnet_version -f ./buildtools/install/docker/Dockerfile.runtime --target dotnetrun . else echo "SKIP build dotnet base image (already exists)" fi @@ -79,7 +79,7 @@ exists=$(docker images | egrep "onlyoffice/4testing-docspace-nodejs-runtime" | e if [ "${exists}" = "" ] || [ "$force" = true ]; then echo "Build nodejs base image from source" - docker build -t onlyoffice/4testing-docspace-nodejs-runtime:$node_version -f ./build/install/docker/Dockerfile.runtime --target noderun . + docker build -t onlyoffice/4testing-docspace-nodejs-runtime:$node_version -f ./buildtools/install/docker/Dockerfile.runtime --target noderun . else echo "SKIP build nodejs base image (already exists)" fi @@ -90,7 +90,7 @@ exists=$(docker images | egrep "onlyoffice/4testing-docspace-proxy-runtime" | eg if [ "${exists}" = "" ] || [ "$force" = true ]; then echo "Build proxy base image from source (apply new nginx config)" - docker build -t onlyoffice/4testing-docspace-proxy-runtime:$proxy_version -f ./build/install/docker/Dockerfile.runtime --target router . + docker build -t onlyoffice/4testing-docspace-proxy-runtime:$proxy_version -f ./buildtools/install/docker/Dockerfile.runtime --target router . else echo "SKIP build proxy base image (already exists)" fi @@ -109,4 +109,4 @@ BUILD_PATH="/var/www" \ SRC_PATH="$dir/publish/services" \ DATA_DIR="$dir/data" \ APP_URL_PORTAL=$portal_url \ -docker-compose -f $dockerDir/docspace.profiles.yml -f $dockerDir/docspace.overcome.yml --profile migration-runner --profile backend-local up -d \ No newline at end of file +docker-compose -f $dockerDir/docspace.profiles.yml -f $dockerDir/docspace.overcome.yml --profile migration-runner --profile backend-local up -d diff --git a/clear.backend.docker.sh b/clear.backend.docker.sh index 61ca770bc8..c92bbe5bfd 100755 --- a/clear.backend.docker.sh +++ b/clear.backend.docker.sh @@ -3,7 +3,7 @@ Containers=$(docker ps -a | egrep "onlyoffice" | awk 'NR>0 {print $1}') RunDir="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )" RootDir=$(builtin cd $RunDir/../; pwd) -DockerDir="${RootDir}/build/install/docker" +DockerDir="${RootDir}/buildtools/install/docker" echo "Clean up containers, volumes or networks" @@ -35,4 +35,4 @@ then docker network prune -f else echo "No containers, images, volumes or networks to clean up" -fi \ No newline at end of file +fi diff --git a/install/OneClickInstall/docspace-install.sh b/install/OneClickInstall/docspace-install.sh index 01217b04f6..6e653d62af 100644 --- a/install/OneClickInstall/docspace-install.sh +++ b/install/OneClickInstall/docspace-install.sh @@ -142,7 +142,7 @@ fi if [ -z $GIT_BRANCH ]; then DOWNLOAD_URL_PREFIX="https://download.onlyoffice.com/${product}" else - DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/build/install/OneClickInstall" + DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/buildtools/install/OneClickInstall" fi if [ "$DOCKER" == "true" ]; then diff --git a/install/OneClickInstall/install-Debian.sh b/install/OneClickInstall/install-Debian.sh index 1729b5059c..0cd3824bcd 100644 --- a/install/OneClickInstall/install-Debian.sh +++ b/install/OneClickInstall/install-Debian.sh @@ -121,7 +121,7 @@ fi if [ -z $GIT_BRANCH ]; then DOWNLOAD_URL_PREFIX="https://download.onlyoffice.com/${product}/install-Debian" else - DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/build/install/OneClickInstall/install-Debian" + DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/buildtools/install/OneClickInstall/install-Debian" fi if [ "${LOCAL_SCRIPTS}" == "true" ]; then diff --git a/install/OneClickInstall/install-Docker.sh b/install/OneClickInstall/install-Docker.sh index 19a270e736..301ee51da5 100644 --- a/install/OneClickInstall/install-Docker.sh +++ b/install/OneClickInstall/install-Docker.sh @@ -1172,7 +1172,7 @@ download_files () { if ! command_exists svn; then install_service svn subversion fi - svn export --force https://github.com/${PACKAGE_SYSNAME}/${PRODUCT}/branches/${GIT_BRANCH}/build/install/docker/ ${BASE_DIR} >/dev/null + svn export --force https://github.com/${PACKAGE_SYSNAME}/${PRODUCT}/branches/${GIT_BRANCH}/buildtools/install/docker/ ${BASE_DIR} >/dev/null fi echo "OK" @@ -1389,4 +1389,4 @@ start_installation () { exit 0; } -start_installation \ No newline at end of file +start_installation diff --git a/install/OneClickInstall/install-RedHat.sh b/install/OneClickInstall/install-RedHat.sh index b7f9a49640..068210756e 100644 --- a/install/OneClickInstall/install-RedHat.sh +++ b/install/OneClickInstall/install-RedHat.sh @@ -134,7 +134,7 @@ END if [ -z $GIT_BRANCH ]; then DOWNLOAD_URL_PREFIX="https://download.onlyoffice.com/${product}/install-RedHat" else - DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/build/install/OneClickInstall/install-RedHat" + DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}/${GIT_BRANCH}/buildtools/install/OneClickInstall/install-RedHat" fi if [ "$LOCAL_SCRIPTS" = "true" ]; then diff --git a/install/common/build-services.ps1 b/install/common/build-services.ps1 index 8d6542d7c0..30dc6f2a39 100644 --- a/install/common/build-services.ps1 +++ b/install/common/build-services.ps1 @@ -25,7 +25,7 @@ dotnet build "$SRC_PATH\server\ASC.Migrations.sln" -o "$BUILD_PATH\services\ASC. 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" -Get-Content "$SRC_PATH\build\install\docker\docker-migration-entrypoint.sh" -raw | % {$_ -replace "`r", ""} | Set-Content -NoNewline $FilePath +Get-Content "$SRC_PATH\buildtools\install\docker\docker-migration-entrypoint.sh" -raw | % {$_ -replace "`r", ""} | Set-Content -NoNewline $FilePath foreach ($SERVICE in $BACKEND_NODEJS_SERVICES) { @@ -54,4 +54,4 @@ foreach ($SERVICE in $BACKEND_DOTNETCORE_SERVICES) Write-Host "== Add docker-entrypoint.py to $SERVICE ==" -ForegroundColor Green $DST = "$BUILD_PATH\services\$SERVICE\service\" Copy-Item $DOCKER_ENTRYPOINT -Destination $DST -} \ No newline at end of file +} diff --git a/install/common/build-services.sh b/install/common/build-services.sh index 458c11d6a1..2c38e18482 100644 --- a/install/common/build-services.sh +++ b/install/common/build-services.sh @@ -90,7 +90,7 @@ while [ "$1" != "" ]; do echo " Parameters:" echo -e " -sp, --srcpath \t path to project root directory" echo -e " -bp, --buildpath \t path where generated output is placed (by default={SRC_PATH}/publish)" - echo -e " -st, --status \t build status Ex. all/frontend-build/backend-publish/backend-dotnet-publish/backend-nodejs-publish/backend-build" + echo -e " -st, --status \t build status Ex. all/frontend-buildtools/backend-publish/backend-dotnet-publish/backend-nodejs-publish/backend-build" echo -e " -sc, --self-contained \t publish the .NET runtime with your application (by default=false)" echo -e " -pc, --publish-configuration \t dotnet publish configuration Ex. Release/Debug" echo -e " -yb, --frontend-build-args \t arguments for yarn building" @@ -139,8 +139,8 @@ function build_dotnetcore_backend { fi if [[ ${DOCKER_ENTRYPOINT} != "false" ]] then - echo "== ADD ${SRC_PATH}/build/install/docker/docker-migration-entrypoint.sh to ASC.Migration.Runner ==" - cp ${SRC_PATH}/build/install/docker/docker-migration-entrypoint.sh ${BUILD_PATH}/services/ASC.Migration.Runner/service/ + echo "== ADD ${SRC_PATH}/buildtools/install/docker/docker-migration-entrypoint.sh to ASC.Migration.Runner ==" + cp ${SRC_PATH}/buildtools/install/docker/docker-migration-entrypoint.sh ${BUILD_PATH}/services/ASC.Migration.Runner/service/ fi fi } @@ -210,9 +210,9 @@ function build_nodejs_frontend { if [[ ${DOCKER_ENTRYPOINT} != "false" ]] then echo "== ADD ${DOCKER_ENTRYPOINT} to ASC.Login ==" - cp ${DOCKER_ENTRYPOINT} ${SRC_PATH}/build/deploy/login/ + cp ${DOCKER_ENTRYPOINT} ${SRC_PATH}/buildtools/deploy/login/ echo "== ADD ${DOCKER_ENTRYPOINT} toASC.Editors ==" - cp ${DOCKER_ENTRYPOINT} ${SRC_PATH}/build/deploy/editor/ + cp ${DOCKER_ENTRYPOINT} ${SRC_PATH}/buildtools/deploy/editor/ fi } @@ -244,7 +244,7 @@ function run { build_dotnetcore_backend "${MIGRATION_CHECK}" ;; * ) - echo "Unknown - \"$1\", Ex. all/frontend-build/backend-publish/backend-dotnet-publish/backend-nodejs-publish/backend-build" 1>&2 + echo "Unknown - \"$1\", Ex. all/frontend-buildtools/backend-publish/backend-dotnet-publish/backend-nodejs-publish/backend-build" 1>&2 exit 1 ;; esac diff --git a/install/deb/debian/product-doceditor.install b/install/deb/debian/product-doceditor.install index c6d4c2983b..b5ccd9514b 100644 --- a/install/deb/debian/product-doceditor.install +++ b/install/deb/debian/product-doceditor.install @@ -1 +1 @@ -../../../build/deploy/editor var/www/{{product}}/products/ASC.Files +../../../buildtools/deploy/editor var/www/{{product}}/products/ASC.Files diff --git a/install/deb/debian/product-login.install b/install/deb/debian/product-login.install index 23593c8ed3..bad80e6bed 100644 --- a/install/deb/debian/product-login.install +++ b/install/deb/debian/product-login.install @@ -1 +1 @@ -../../../build/deploy/login/* var/www/{{product}}/products/ASC.Login/login +../../../buildtools/deploy/login/* var/www/{{product}}/products/ASC.Login/login diff --git a/install/deb/debian/product-proxy.install b/install/deb/debian/product-proxy.install index 56a018e637..d1472b1b8e 100644 --- a/install/deb/debian/product-proxy.install +++ b/install/deb/debian/product-proxy.install @@ -1,9 +1,9 @@ ## COPY PUBLIC ## -../../../build/install/common/{{product}}-ssl-setup usr/bin -../../../build/install/docker/config/nginx/templates/*.template etc/onlyoffice/{{product}}/openresty -../../../build/install/docker/config/nginx/onlyoffice* etc/openresty/conf.d +../../../buildtools/install/common/{{product}}-ssl-setup usr/bin +../../../buildtools/install/docker/config/nginx/templates/*.template etc/onlyoffice/{{product}}/openresty +../../../buildtools/install/docker/config/nginx/onlyoffice* etc/openresty/conf.d ../../../config/nginx/onlyoffice*.conf etc/openresty/conf.d -../../../build/install/docker/config/nginx/letsencrypt* etc/openresty/includes +../../../buildtools/install/docker/config/nginx/letsencrypt* etc/openresty/includes ../../../config/nginx/includes/onlyoffice*.conf etc/openresty/includes -../../../build/deploy/public/* var/www/{{product}}/public -../../../build/deploy/client/* var/www/{{product}}/client +../../../buildtools/deploy/public/* var/www/{{product}}/public +../../../buildtools/deploy/client/* var/www/{{product}}/client diff --git a/install/deb/debian/product-radicale.install b/install/deb/debian/product-radicale.install index 2e3f736b26..61e6ce09fb 100644 --- a/install/deb/debian/product-radicale.install +++ b/install/deb/debian/product-radicale.install @@ -1 +1 @@ -../../../build/install/RadicalePlugins/* var/www/{{product}}/Tools/radicale/plugins +../../../buildtools/install/RadicalePlugins/* var/www/{{product}}/Tools/radicale/plugins diff --git a/install/deb/debian/rules b/install/deb/debian/rules index cfb0db3484..a740f58f18 100644 --- a/install/deb/debian/rules +++ b/install/deb/debian/rules @@ -11,14 +11,14 @@ export DH_OPTIONS=-v PRODUCT={{product}} CURRENT_PATH=${CURDIR} SRC_PATH=$(shell cd ../../../; pwd) -SCRIPT_PATH=build/install/common +SCRIPT_PATH=buildtools/install/common override_dh_auto_clean: @echo "RULES.$@" dh_testdir rm -rf ${CURRENT_PATH}/debian/*.service rm -rf ${CURRENT_PATH}/debian/*.lintian-overrides - rm -rf ${SRC_PATH}/build/install/${PRODUCT}* + rm -rf ${SRC_PATH}/buildtools/install/${PRODUCT}* override_dh_auto_configure: @echo "RULES.$@" @@ -51,10 +51,10 @@ override_dh_auto_build: sed 's_etc/nginx_etc/openresty_g' -i ${SRC_PATH}/config/nginx/*.conf sed 's/teamlab.info/onlyoffice.com/g' -i ${SRC_PATH}/config/autofac.consumers.json - sed -e 's/$$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i ${SRC_PATH}/build/install/docker/config/nginx/onlyoffice-proxy*.conf - sed "s_\(.*root\).*;_\1 \"/var/www/${PRODUCT}\";_g" -i ${SRC_PATH}/build/install/docker/config/nginx/letsencrypt.conf - sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -i ${SRC_PATH}/build/install/docker/config/nginx/templates/nginx.conf.template - mv -f ${SRC_PATH}/build/install/docker/config/nginx/onlyoffice-proxy-ssl.conf ${SRC_PATH}/build/install/docker/config/nginx/onlyoffice-proxy-ssl.conf.template + sed -e 's/$$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i ${SRC_PATH}/buildtools/install/docker/config/nginx/onlyoffice-proxy*.conf + sed "s_\(.*root\).*;_\1 \"/var/www/${PRODUCT}\";_g" -i ${SRC_PATH}/buildtools/install/docker/config/nginx/letsencrypt.conf + sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -i ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/nginx.conf.template + mv -f ${SRC_PATH}/buildtools/install/docker/config/nginx/onlyoffice-proxy-ssl.conf ${SRC_PATH}/buildtools/install/docker/config/nginx/onlyoffice-proxy-ssl.conf.template for i in ${PRODUCT} $$(ls ${CURRENT_PATH}/debian/*.install | grep -oP 'debian/\K.*' | grep -o '^[^.]*'); do \ cp ${CURRENT_PATH}/debian/source/lintian-overrides ${CURRENT_PATH}/debian/$$i.lintian-overrides; \ diff --git a/install/docker/Dockerfile b/install/docker/Dockerfile index 3bb935b739..dde82613a3 100644 --- a/install/docker/Dockerfile +++ b/install/docker/Dockerfile @@ -58,13 +58,13 @@ RUN mkdir -p /app/onlyoffice/ && \ find config/ -maxdepth 1 -name "*.json" | grep -v test | grep -v dev | xargs tar -cvf config.tar && \ tar -C "/app/onlyoffice/" -xvf config.tar && \ cp config/*.config /app/onlyoffice/config/ && \ - mkdir -p ${SRC_PATH}/build/deploy/client && \ - mkdir -p ${SRC_PATH}/build/deploy/public && \ + mkdir -p ${SRC_PATH}/buildtools/deploy/client && \ + mkdir -p ${SRC_PATH}/buildtools/deploy/public && \ mkdir -p /etc/nginx/conf.d && cp -f config/nginx/onlyoffice*.conf /etc/nginx/conf.d/ && \ mkdir -p /etc/nginx/includes/ && cp -f config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && \ sed -i "s/\"number\".*,/\"number\": \"${PRODUCT_VERSION}.${BUILD_NUMBER}\",/g" /app/onlyoffice/config/appsettings.json && \ sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \ - cd ${SRC_PATH}/build/install/common/ && \ + cd ${SRC_PATH}/buildtools/install/common/ && \ bash build-services.sh \ -sp "${SRC_PATH}" \ -bp "${BUILD_PATH}" \ @@ -156,11 +156,11 @@ RUN apt-get -y update && \ # copy static services files and config values COPY --from=base /etc/nginx/conf.d /etc/nginx/conf.d COPY --from=base /etc/nginx/includes /etc/nginx/includes -COPY --from=base ${SRC_PATH}/build/deploy/client ${BUILD_PATH}/client -COPY --from=base ${SRC_PATH}/build/deploy/public ${BUILD_PATH}/public -COPY --from=base ${SRC_PATH}/build/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template -COPY --from=base ${SRC_PATH}/build/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template -COPY --from=base ${SRC_PATH}/build/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh +COPY --from=base ${SRC_PATH}/buildtools/deploy/client ${BUILD_PATH}/client +COPY --from=base ${SRC_PATH}/buildtools/deploy/public ${BUILD_PATH}/public +COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template +COPY --from=base ${SRC_PATH}/buildtools/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template +COPY --from=base ${SRC_PATH}/buildtools/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh # add defualt user and group for no-root run RUN chown nginx:nginx /etc/nginx/* -R && \ @@ -187,8 +187,8 @@ RUN chown nginx:nginx /etc/nginx/* -R && \ FROM noderun as doceditor WORKDIR ${BUILD_PATH}/services/ASC.Editors/editor -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/deploy/editor/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/deploy/editor/ . CMD ["server.js", "ASC.Editors"] @@ -196,8 +196,8 @@ CMD ["server.js", "ASC.Editors"] FROM noderun as login WORKDIR ${BUILD_PATH}/services/ASC.Login/login -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/deploy/login/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/deploy/login/ . CMD ["server.js", "ASC.Login"] @@ -205,7 +205,7 @@ CMD ["server.js", "ASC.Login"] FROM dotnetrun AS backup_background WORKDIR ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/service/ . CMD ["ASC.Data.Backup.BackgroundTasks.dll", "ASC.Data.Backup.BackgroundTasks", "core:eventBus:subscriptionClientName=asc_event_bus_backup_queue"] @@ -214,7 +214,7 @@ CMD ["ASC.Data.Backup.BackgroundTasks.dll", "ASC.Data.Backup.BackgroundTasks", " FROM dotnetrun AS api_system WORKDIR ${BUILD_PATH}/services/ASC.ApiSystem/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ApiSystem/service/ . CMD ["ASC.ApiSystem.dll", "ASC.ApiSystem"] @@ -223,7 +223,7 @@ CMD ["ASC.ApiSystem.dll", "ASC.ApiSystem"] FROM dotnetrun AS clear-events WORKDIR ${BUILD_PATH}/services/ASC.ClearEvents/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.ClearEvents/service/ . CMD ["ASC.ClearEvents.dll", "ASC.ClearEvents"] @@ -232,7 +232,7 @@ CMD ["ASC.ClearEvents.dll", "ASC.ClearEvents"] FROM dotnetrun AS backup WORKDIR ${BUILD_PATH}/services/ASC.Data.Backup/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.Backup/service/ . CMD ["ASC.Data.Backup.dll", "ASC.Data.Backup"] @@ -241,7 +241,7 @@ CMD ["ASC.Data.Backup.dll", "ASC.Data.Backup"] FROM dotnetrun AS files WORKDIR ${BUILD_PATH}/products/ASC.Files/server/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files/service/ . COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/ASC.Files/Server/DocStore . @@ -252,7 +252,7 @@ FROM dotnetrun AS files_services ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64 WORKDIR ${BUILD_PATH}/products/ASC.Files/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ . COPY --from=linuxserver/ffmpeg:latest --chown=onlyoffice:onlyoffice /usr/local/bin/ /usr/local/bin/ @@ -262,7 +262,7 @@ CMD ["ASC.Files.Service.dll", "ASC.Files.Service", "core:eventBus:subscriptionCl FROM dotnetrun AS notify WORKDIR ${BUILD_PATH}/services/ASC.Notify/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Notify/service/ . CMD ["ASC.Notify.dll", "ASC.Notify", "core:eventBus:subscriptionClientName=asc_event_bus_notify_queue"] @@ -271,7 +271,7 @@ CMD ["ASC.Notify.dll", "ASC.Notify", "core:eventBus:subscriptionClientName=asc_e FROM dotnetrun AS people_server WORKDIR ${BUILD_PATH}/products/ASC.People/server/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.People/service/ . CMD ["ASC.People.dll", "ASC.People"] @@ -280,7 +280,7 @@ CMD ["ASC.People.dll", "ASC.People"] FROM noderun AS socket WORKDIR ${BUILD_PATH}/services/ASC.Socket.IO/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Socket.IO/service/ . CMD ["server.js", "ASC.Socket.IO"] @@ -289,7 +289,7 @@ CMD ["server.js", "ASC.Socket.IO"] FROM noderun AS ssoauth WORKDIR ${BUILD_PATH}/services/ASC.SsoAuth/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.SsoAuth/service/ . CMD ["app.js", "ASC.SsoAuth"] @@ -298,7 +298,7 @@ CMD ["app.js", "ASC.SsoAuth"] FROM dotnetrun AS studio_notify WORKDIR ${BUILD_PATH}/services/ASC.Studio.Notify/service/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Studio.Notify/service/ . CMD ["ASC.Studio.Notify.dll", "ASC.Studio.Notify"] @@ -307,7 +307,7 @@ CMD ["ASC.Studio.Notify.dll", "ASC.Studio.Notify"] FROM dotnetrun AS api WORKDIR ${BUILD_PATH}/studio/ASC.Web.Api/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.Api/service/ . CMD ["ASC.Web.Api.dll", "ASC.Web.Api"] @@ -316,7 +316,7 @@ CMD ["ASC.Web.Api.dll", "ASC.Web.Api"] FROM dotnetrun AS studio WORKDIR ${BUILD_PATH}/studio/ASC.Web.Studio/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-entrypoint.py . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-entrypoint.py . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.Studio/service/ . CMD ["ASC.Web.Studio.dll", "ASC.Web.Studio"] @@ -325,7 +325,7 @@ CMD ["ASC.Web.Studio.dll", "ASC.Web.Studio"] FROM dotnetrun AS healthchecks WORKDIR ${BUILD_PATH}/services/ASC.Web.HealthChecks.UI/service -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-healthchecks-entrypoint.sh . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-healthchecks-entrypoint.sh . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.HealthChecks.UI/service/ . ENTRYPOINT ["./docker-healthchecks-entrypoint.sh"] @@ -338,7 +338,7 @@ ARG SRC_PATH ENV BUILD_PATH=${BUILD_PATH} ENV SRC_PATH=${SRC_PATH} WORKDIR ${BUILD_PATH}/services/ASC.Migration.Runner/ -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/docker-migration-entrypoint.sh . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/docker-migration-entrypoint.sh . COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Migration.Runner/service/ . ENTRYPOINT ["./docker-migration-entrypoint.sh"] @@ -355,7 +355,7 @@ RUN mkdir -p /app/ASC.Files/server && \ addgroup --system --gid 107 onlyoffice && \ adduser -u 104 onlyoffice --home /var/www/onlyoffice --system -G onlyoffice -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh COPY --from=base /var/www/services/ASC.Files/service/ /app/ASC.Files/server/ COPY --from=base /var/www/services/ASC.People/service/ /app/ASC.People/server/ ENTRYPOINT ["./app/docker-entrypoint.sh"] @@ -369,5 +369,5 @@ ENV SRC_PATH=${SRC_PATH} RUN mkdir /app -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/install/docker/wait-bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/install/docker/wait-bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh ENTRYPOINT ["./app/docker-entrypoint.sh"] diff --git a/install/docker/Dockerfile.app b/install/docker/Dockerfile.app index da0fba648a..d9f6c624fb 100644 --- a/install/docker/Dockerfile.app +++ b/install/docker/Dockerfile.app @@ -52,7 +52,7 @@ RUN cd ${SRC_PATH} && \ mkdir -p /etc/nginx/includes/ && cp -f config/nginx/includes/onlyoffice*.conf /etc/nginx/includes/ && \ sed -i "s/\"number\".*,/\"number\": \"${PRODUCT_VERSION}.${BUILD_NUMBER}\",/g" /app/onlyoffice/config/appsettings.json && \ sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \ - cd ${SRC_PATH}/build/install/common/ && \ + cd ${SRC_PATH}/buildtools/install/common/ && \ bash build-frontend.sh -sp "${SRC_PATH}" -ba "${BUILD_ARGS}" -da "${DEPLOY_ARGS}" -di "${DEBUG_INFO}" && \ bash build-backend.sh -sp "${SRC_PATH}" && \ bash publish-backend.sh -pc "${PUBLISH_CNF}" -sp "${SRC_PATH}" -bp "${BUILD_PATH}" && \ @@ -144,8 +144,8 @@ RUN apt-get -y update && \ # copy static services files and config values COPY --from=base /etc/nginx/conf.d /etc/nginx/conf.d COPY --from=base /etc/nginx/includes /etc/nginx/includes -COPY --from=base ${SRC_PATH}/build/deploy/client ${BUILD_PATH}/client -COPY --from=base ${SRC_PATH}/build/deploy/public ${BUILD_PATH}/public +COPY --from=base ${SRC_PATH}/buildtools/deploy/client ${BUILD_PATH}/client +COPY --from=base ${SRC_PATH}/buildtools/deploy/public ${BUILD_PATH}/public COPY /config/nginx/docker-entrypoint.sh /docker-entrypoint.sh COPY /config/nginx/docker-entrypoint.d /docker-entrypoint.d COPY /config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template @@ -178,7 +178,7 @@ FROM noderun as doceditor WORKDIR ${BUILD_PATH}/products/ASC.Editors/editor COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/deploy/editor/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/deploy/editor/ . CMD ["server.js", "ASC.Editors"] @@ -187,7 +187,7 @@ FROM noderun as login WORKDIR ${BUILD_PATH}/products/ASC.Login/login COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py -COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/deploy/login/ . +COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/buildtools/deploy/login/ . CMD ["server.js", "ASC.Login"] diff --git a/install/docker/Dockerfile.ffvideo b/install/docker/Dockerfile.ffvideo index ba9cd0c3da..1b707b76c5 100644 --- a/install/docker/Dockerfile.ffvideo +++ b/install/docker/Dockerfile.ffvideo @@ -140,7 +140,7 @@ RUN \ cd ${DIR} && \ curl -sL https://github.com/videolan/x265/archive/refs/tags/${X265_VERSION}.tar.gz | \ tar -zx && \ - cd x265-${X265_VERSION}/build/linux && \ + cd x265-${X265_VERSION}/buildtools/linux && \ sed -i "/-DEXTRA_LIB/ s/$/ -DCMAKE_INSTALL_PREFIX=\${PREFIX}/" multilib.sh && \ sed -i "/^cmake/ s/$/ -DENABLE_CLI=OFF/" multilib.sh && \ ./multilib.sh && \ @@ -237,7 +237,7 @@ RUN \ curl -sLO http://downloads.xvid.org/downloads/xvidcore-${XVID_VERSION}.tar.gz && \ echo ${XVID_SHA256SUM} | sha256sum --check && \ tar -zx -f xvidcore-${XVID_VERSION}.tar.gz && \ - cd xvidcore/build/generic && \ + cd xvidcore/buildtools/generic && \ ./configure --prefix="${PREFIX}" --bindir="${PREFIX}/bin" && \ make && \ make install && \ diff --git a/install/docker/Dockerfile.runtime b/install/docker/Dockerfile.runtime index 193b122874..c59ed5ed97 100644 --- a/install/docker/Dockerfile.runtime +++ b/install/docker/Dockerfile.runtime @@ -9,7 +9,7 @@ ARG BUILD_PATH WORKDIR ${SRC_PATH} -COPY build/config ./config +COPY buildtools/config ./config RUN find config/ -maxdepth 1 -name "*.json" | grep -v test | grep -v dev | xargs tar -cvf config.tar && \ tar -C "/app/onlyoffice/" -xvf config.tar && \ @@ -93,12 +93,12 @@ RUN apt-get -y update && \ # copy static services files and config values COPY --from=base /etc/nginx/conf.d /etc/nginx/conf.d -COPY /build/install/docker/config/nginx/docker-entrypoint.sh /docker-entrypoint.sh -COPY /build/install/docker/config/nginx/docker-entrypoint.d /docker-entrypoint.d +COPY /buildtools/install/docker/config/nginx/docker-entrypoint.sh /docker-entrypoint.sh +COPY /buildtools/install/docker/config/nginx/docker-entrypoint.d /docker-entrypoint.d -COPY /build/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template -COPY /build/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template -COPY /build/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh +COPY /buildtools/install/docker/config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template +COPY /buildtools/install/docker/config/nginx/templates/nginx.conf.template /etc/nginx/nginx.conf.template +COPY /buildtools/install/docker/prepare-nginx-router.sh /docker-entrypoint.d/prepare-nginx-router.sh RUN dos2unix /docker-entrypoint.d/* && \ dos2unix /docker-entrypoint.sh && \ diff --git a/install/docker/Readme.md b/install/docker/Readme.md index fb9b9078d6..10bf36ce75 100644 --- a/install/docker/Readme.md +++ b/install/docker/Readme.md @@ -1,7 +1,7 @@ # Getting Started * Download App run: git clone git clone https://github.com/ONLYOFFICE/AppServer.git -* cd ./AppServer/build/install/docker/ +* cd ./AppServer/buildtools/install/docker/ # Installation diff --git a/install/docker/docspace.overcome.yml b/install/docker/docspace.overcome.yml index 35aca148e9..3abd7baefa 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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/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}/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 + - ${ROOT_DIR}/buildtools/config/appsettings.${ENV_EXTENSION}.json:/app/onlyoffice/config/appsettings.${ENV_EXTENSION}.json + - ${ROOT_DIR}/buildtools/config/apisystem.${ENV_EXTENSION}.json:/app/onlyoffice/config/apisystem.${ENV_EXTENSION}.json depends_on: onlyoffice-migration-runner: condition: service_completed_successfully diff --git a/install/install.bat b/install/install.bat index c78c8e8745..b03e6a86f3 100644 --- a/install/install.bat +++ b/install/install.bat @@ -6,15 +6,15 @@ call runasadmin.bat "%~dpnx0" if %errorlevel% == 0 ( PUSHD %~dp0..\.. setlocal EnableDelayedExpansion - for /R "build\run\" %%f in (*.bat) do ( - call build\run\%%~nxf + for /R "buildtools\run\" %%f in (*.bat) do ( + call buildtools\run\%%~nxf echo service create "Onlyoffice%%~nf" call sc create "Onlyoffice%%~nf" displayname= "ONLYOFFICE %%~nf" binPath= "!servicepath!" ) - for /R "build\run\" %%f in (*.xml) do ( - call build\install\win\WinSW3.0.0.exe install %%f + for /R "buildtools\run\" %%f in (*.xml) do ( + call buildtools\install\win\WinSW3.0.0.exe install %%f ) ) echo. -pause \ No newline at end of file +pause diff --git a/install/rpm/SPECS/build.spec b/install/rpm/SPECS/build.spec index 17df32e1da..a143c3aa00 100644 --- a/install/rpm/SPECS/build.spec +++ b/install/rpm/SPECS/build.spec @@ -1,12 +1,12 @@ %build -bash build/install/common/systemd/build.sh +bash buildtools/install/common/systemd/build.sh -bash build/install/common/build-frontend.sh --srcpath %{_builddir}/%{sourcename} -bash build/install/common/build-backend.sh --srcpath %{_builddir}/%{sourcename} -bash build/install/common/publish-backend.sh --srcpath %{_builddir}/%{sourcename} -rename -f -v "s/product([^\/]*)$/%{product}\$1/g" build/install/common/* -sed -i "s/{{product}}/%{product}/g" %{_builddir}/%{sourcename}/build/install/common/logrotate/product-common +bash buildtools/install/common/build-frontend.sh --srcpath %{_builddir}/%{sourcename} +bash buildtools/install/common/build-backend.sh --srcpath %{_builddir}/%{sourcename} +bash buildtools/install/common/publish-backend.sh --srcpath %{_builddir}/%{sourcename} +rename -f -v "s/product([^\/]*)$/%{product}\$1/g" buildtools/install/common/* +sed -i "s/{{product}}/%{product}/g" %{_builddir}/%{sourcename}/buildtools/install/common/logrotate/product-common rm -f %{_builddir}/%{sourcename}/config/nginx/onlyoffice-login.conf @@ -22,9 +22,9 @@ sed 's_\(minlevel=\)".*"_\1"Warn"_g' -i %{_builddir}/%{sourcename}/config/nlog.c sed 's_etc/nginx_etc/openresty_g' -i %{_builddir}/%{sourcename}/config/nginx/*.conf sed 's/teamlab.info/onlyoffice.com/g' -i %{_builddir}/%{sourcename}/config/autofac.consumers.json -sed -e 's/$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i %{_builddir}/%{sourcename}/build/install/docker/config/nginx/onlyoffice-proxy*.conf -sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -i %{_builddir}/%{sourcename}/build/install/docker/config/nginx/templates/nginx.conf.template -sed -i "s_\(.*root\).*;_\1 \"/var/www/%{product}\";_g" -i %{_builddir}/%{sourcename}/build/install/docker/config/nginx/letsencrypt.conf +sed -e 's/$router_host/127.0.0.1/g' -e 's/the_host/host/g' -e 's/the_scheme/scheme/g' -e 's_includes_/etc/openresty/includes_g' -i %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/onlyoffice-proxy*.conf +sed -e '/.pid/d' -e '/temp_path/d' -e 's_etc/nginx_etc/openresty_g' -i %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/templates/nginx.conf.template +sed -i "s_\(.*root\).*;_\1 \"/var/www/%{product}\";_g" -i %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/letsencrypt.conf find %{_builddir}/%{sourcename}/publish/ \ %{_builddir}/%{sourcename}/ASC.Migration.Runner \ diff --git a/install/rpm/SPECS/install.spec b/install/rpm/SPECS/install.spec index a1814513c6..129d6b71a4 100644 --- a/install/rpm/SPECS/install.spec +++ b/install/rpm/SPECS/install.spec @@ -35,14 +35,14 @@ mkdir -p "%{buildroot}/%{_var}/www/onlyoffice/Data" cp -rf %{_builddir}/%{sourcename}/LICENSE "%{buildroot}%{_docdir}/%{name}-%{version}-%{release}/" cp -rf %{_builddir}/%{sourcename}/README.md "%{buildroot}%{_docdir}/%{name}-%{version}-%{release}/" cp -rf %{_builddir}/%{sourcename}/ASC.Migration.Runner/service/* "%{buildroot}%{buildpath}/services/ASC.Migration.Runner/" -cp -rf %{_builddir}/%{sourcename}/build/deploy/editor/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/" -cp -rf %{_builddir}/%{sourcename}/build/deploy/public/* "%{buildroot}%{buildpath}/public/" -cp -rf %{_builddir}/%{sourcename}/build/deploy/client/* "%{buildroot}%{buildpath}/client/" -cp -rf %{_builddir}/%{sourcename}/build/deploy/login/* "%{buildroot}%{buildpath}/products/ASC.Login/login/" -cp -rf %{_builddir}/%{sourcename}/build/install/RadicalePlugins/* "%{buildroot}%{buildpath}/Tools/radicale/plugins/" -cp -rf %{_builddir}/%{sourcename}/build/install/common/%{product}-configuration "%{buildroot}%{_bindir}/%{product}-configuration" -cp -rf %{_builddir}/%{sourcename}/build/install/common/systemd/modules/* "%{buildroot}/usr/lib/systemd/system/" -cp -rf %{_builddir}/%{sourcename}/build/install/common/logrotate/product-common "%{buildroot}%{_sysconfdir}/logrotate.d/%{product}-common" +cp -rf %{_builddir}/%{sourcename}/buildtools/deploy/editor/* "%{buildroot}%{buildpath}/products/ASC.Files/editor/" +cp -rf %{_builddir}/%{sourcename}/buildtools/deploy/public/* "%{buildroot}%{buildpath}/public/" +cp -rf %{_builddir}/%{sourcename}/buildtools/deploy/client/* "%{buildroot}%{buildpath}/client/" +cp -rf %{_builddir}/%{sourcename}/buildtools/deploy/login/* "%{buildroot}%{buildpath}/products/ASC.Login/login/" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/RadicalePlugins/* "%{buildroot}%{buildpath}/Tools/radicale/plugins/" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/common/%{product}-configuration "%{buildroot}%{_bindir}/%{product}-configuration" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/common/systemd/modules/* "%{buildroot}/usr/lib/systemd/system/" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/common/logrotate/product-common "%{buildroot}%{_sysconfdir}/logrotate.d/%{product}-common" cp -rf %{_builddir}/%{sourcename}/config/* "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/" cp -rf %{_builddir}/%{sourcename}/config/nginx/includes/onlyoffice*.conf "%{buildroot}%{_sysconfdir}/openresty/includes/" cp -rf %{_builddir}/%{sourcename}/config/nginx/onlyoffice*.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/" @@ -61,8 +61,8 @@ cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Studio.Notify/service/* " cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Web.Api/service/* "%{buildroot}%{buildpath}/studio/ASC.Web.Api/" cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Web.HealthChecks.UI/service/* "%{buildroot}%{buildpath}/services/ASC.Web.HealthChecks.UI/" cp -rf %{_builddir}/%{sourcename}/publish/services/ASC.Web.Studio/service/* "%{buildroot}%{buildpath}/studio/ASC.Web.Studio/" -cp -rf %{_builddir}/%{sourcename}/build/install/docker/config/nginx/onlyoffice-proxy.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/onlyoffice-proxy.conf" -cp -rf %{_builddir}/%{sourcename}/build/install/docker/config/nginx/onlyoffice-proxy-ssl.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/onlyoffice-proxy-ssl.conf.template" -cp -rf %{_builddir}/%{sourcename}/build/install/docker/config/nginx/letsencrypt.conf "%{buildroot}%{_sysconfdir}/openresty/includes/letsencrypt.conf" -cp -rf %{_builddir}/%{sourcename}/build/install/docker/config/nginx/templates/nginx.conf.template "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/openresty/nginx.conf.template" -cp -rf %{_builddir}/%{sourcename}/build/install/common/%{product}-ssl-setup "%{buildroot}%{_bindir}/%{product}-ssl-setup" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/onlyoffice-proxy.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/onlyoffice-proxy.conf" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/onlyoffice-proxy-ssl.conf "%{buildroot}%{_sysconfdir}/openresty/conf.d/onlyoffice-proxy-ssl.conf.template" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/letsencrypt.conf "%{buildroot}%{_sysconfdir}/openresty/includes/letsencrypt.conf" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/docker/config/nginx/templates/nginx.conf.template "%{buildroot}%{_sysconfdir}/onlyoffice/%{product}/openresty/nginx.conf.template" +cp -rf %{_builddir}/%{sourcename}/buildtools/install/common/%{product}-ssl-setup "%{buildroot}%{_bindir}/%{product}-ssl-setup" diff --git a/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc b/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc index d6791c5e50..ea0d6f8d85 100644 Binary files a/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc and b/install/snap/snap/plugins/__pycache__/x-redis.cpython-35.pyc differ diff --git a/install/win/CustomActions/C#/Utils/Utils.csproj b/install/win/CustomActions/C#/Utils/Utils.csproj index d6d06a4b91..7edee52fdf 100644 --- a/install/win/CustomActions/C#/Utils/Utils.csproj +++ b/install/win/CustomActions/C#/Utils/Utils.csproj @@ -1,5 +1,5 @@ - - + + Debug x86 @@ -57,4 +57,4 @@ - \ No newline at end of file + diff --git a/install/win/frontend-copy.bat b/install/win/frontend-copy.bat index 2fb192bb0d..0cdfe05103 100644 --- a/install/win/frontend-copy.bat +++ b/install/win/frontend-copy.bat @@ -16,7 +16,7 @@ if defined SecondArg ( set PathToAppFolder=%FirstArg%\publish ) -xcopy "%PathToRepository%\build\deploy\public" "%PathToAppFolder%\public" /s /y /b /i -xcopy "%PathToRepository%\build\deploy\client" "%PathToAppFolder%\client" /s /y /b /i +xcopy "%PathToRepository%\buildtools\deploy\public" "%PathToAppFolder%\public" /s /y /b /i +xcopy "%PathToRepository%\buildtools\deploy\client" "%PathToAppFolder%\client" /s /y /b /i xcopy "%PathToRepository%\config\nginx" "%PathToAppFolder%\nginx\conf" /s /y /b /i xcopy "%PathToRepository%\config\*" "%PathToAppFolder%\config" /y /b /i diff --git a/install/win/publish-script.bat b/install/win/publish-script.bat index 1694f5d4de..548f9c7d6f 100644 --- a/install/win/publish-script.bat +++ b/install/win/publish-script.bat @@ -41,7 +41,7 @@ xcopy "%PathToRepository%\common\ASC.SsoAuth" "%PathToAppFolder%\services\ASC.Ss rem backend services (Nodejs) in directory 'products' mkdir "%PathToAppFolder%\products\ASC.Login\login" -xcopy "%PathToRepository%\build\deploy\login" "%PathToAppFolder%\products\ASC.Login\login" /s /y /b /i +xcopy "%PathToRepository%\buildtools\deploy\login" "%PathToAppFolder%\products\ASC.Login\login" /s /y /b /i mkdir "%PathToAppFolder%\products\ASC.Files\editor" -xcopy "%PathToRepository%\build\deploy\editor" "%PathToAppFolder%\products\ASC.Files\editor" /s /y /b /i +xcopy "%PathToRepository%\buildtools\deploy\editor" "%PathToAppFolder%\products\ASC.Files\editor" /s /y /b /i diff --git a/run.e2e.test.bat b/run.e2e.test.bat index b9f8f53f89..ee6cf6667f 100644 --- a/run.e2e.test.bat +++ b/run.e2e.test.bat @@ -21,15 +21,15 @@ call yarn deploy REM copy nginx configurations to deploy folder -xcopy config\nginx\onlyoffice.conf build\deploy\nginx\ /E /R /Y -powershell -Command "(gc build\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII build\deploy\nginx\onlyoffice.conf" +xcopy config\nginx\onlyoffice.conf buildtools\deploy\nginx\ /E /R /Y +powershell -Command "(gc buildtools\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII buildtools\deploy\nginx\onlyoffice.conf" -xcopy config\nginx\sites-enabled\* build\deploy\nginx\sites-enabled\ /E /R /Y +xcopy config\nginx\sites-enabled\* buildtools\deploy\nginx\sites-enabled\ /E /R /Y REM fix paths -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-editor.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-login.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-client.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf" REM restart nginx echo service nginx stop @@ -62,4 +62,4 @@ POPD if "%1"=="nopause" goto start pause -:start \ No newline at end of file +:start diff --git a/run.e2e.translations.tests.bat b/run.e2e.translations.tests.bat index 9a5a056e6d..58f49b1e2c 100644 --- a/run.e2e.translations.tests.bat +++ b/run.e2e.translations.tests.bat @@ -21,15 +21,15 @@ call yarn deploy REM copy nginx configurations to deploy folder -xcopy config\nginx\onlyoffice.conf build\deploy\nginx\ /E /R /Y -powershell -Command "(gc build\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII build\deploy\nginx\onlyoffice.conf" +xcopy config\nginx\onlyoffice.conf buildtools\deploy\nginx\ /E /R /Y +powershell -Command "(gc buildtools\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII buildtools\deploy\nginx\onlyoffice.conf" -xcopy config\nginx\sites-enabled\* build\deploy\nginx\sites-enabled\ /E /R /Y +xcopy config\nginx\sites-enabled\* buildtools\deploy\nginx\sites-enabled\ /E /R /Y REM fix paths -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-editor.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-login.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-client.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf" REM restart nginx echo service nginx stop @@ -62,4 +62,4 @@ POPD if "%1"=="nopause" goto start pause -:start \ No newline at end of file +:start diff --git a/run.e2e.translations.tests.personal.bat b/run.e2e.translations.tests.personal.bat index 9ca9772237..777575ad3f 100644 --- a/run.e2e.translations.tests.personal.bat +++ b/run.e2e.translations.tests.personal.bat @@ -21,15 +21,15 @@ call yarn deploy:personal REM copy nginx configurations to deploy folder -xcopy config\nginx\onlyoffice.conf build\deploy\nginx\ /E /R /Y -powershell -Command "(gc build\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII build\deploy\nginx\onlyoffice.conf" +xcopy config\nginx\onlyoffice.conf buildtools\deploy\nginx\ /E /R /Y +powershell -Command "(gc buildtools\deploy\nginx\onlyoffice.conf) -replace '#', '' | Out-File -encoding ASCII buildtools\deploy\nginx\onlyoffice.conf" -xcopy config\nginx\sites-enabled\* build\deploy\nginx\sites-enabled\ /E /R /Y +xcopy config\nginx\sites-enabled\* buildtools\deploy\nginx\sites-enabled\ /E /R /Y REM fix paths -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-editor.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-login.conf" -powershell -Command "(gc build\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII build\deploy\nginx\sites-enabled\onlyoffice-client.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf) -replace 'ROOTPATH', '%~dp0deploy\products\ASC.Files\editor' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-editor.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf) -replace 'ROOTPATH', '%~dp0deploy\login' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-login.conf" +powershell -Command "(gc buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf) -replace 'ROOTPATH', '%~dp0deploy\client' -replace '\\', '/' | Out-File -encoding ASCII buildtools\deploy\nginx\sites-enabled\onlyoffice-client.conf" REM restart nginx echo service nginx stop @@ -62,4 +62,4 @@ POPD if "%1"=="nopause" goto start pause -:start \ No newline at end of file +:start diff --git a/run/Editors.xml b/run/Editors.xml index e21e12cea2..edc6d91619 100644 --- a/run/Editors.xml +++ b/run/Editors.xml @@ -3,8 +3,8 @@ ONLYOFFICE Editors SSR manual node - ../../build/deploy/editor/server.js + ../../buildtools/deploy/editor/server.js true - \ No newline at end of file + diff --git a/run/Login.xml b/run/Login.xml index b13236b459..4b45ee77e2 100644 --- a/run/Login.xml +++ b/run/Login.xml @@ -3,8 +3,8 @@ ONLYOFFICE Login SSR manual node - ../../build/deploy/login/server.js + ../../buildtools/deploy/login/server.js true - \ No newline at end of file + diff --git a/start/start.backend.docker.sh b/start/start.backend.docker.sh index 9629ea4653..4508280059 100644 --- a/start/start.backend.docker.sh +++ b/start/start.backend.docker.sh @@ -7,7 +7,7 @@ dir=$(builtin cd $rd/../../; pwd) echo "Root directory:" $dir -cd $dir/build/install/docker/ +cd $dir/buildtools/install/docker/ docker_dir="$( pwd )" @@ -37,4 +37,4 @@ 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 start \ No newline at end of file +docker-compose -f docspace.profiles.yml -f docspace.overcome.yml --profile backend-local start