From c85d82d4d2bf5d9d680f05adc821252a39b0edc4 Mon Sep 17 00:00:00 2001 From: Alexey Bannov Date: Tue, 7 Nov 2023 13:09:44 +0300 Subject: [PATCH 1/4] added AWS DynamoDB connection string --- config/appsettings.json | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/config/appsettings.json b/config/appsettings.json index 178cee0333..1ab6f09de4 100644 --- a/config/appsettings.json +++ b/config/appsettings.json @@ -466,6 +466,11 @@ "region": "us-east-1", "logGroupName": "/asc/docspace/cluster/cluster_name/general", "logStreamName": "${hostname} - ${applicationContext} - ${date} - ${guid}" + }, + "dynamoDB": { + "accessKeyId": "", + "secretAccessKey": "", + "region": "us-east-1" } } } From fa0f105b2b1802e4d9dd6a1e992281606f4c851c Mon Sep 17 00:00:00 2001 From: Nasrullo Nurullaev <61620246+nasrullonurullaev@users.noreply.github.com> Date: Tue, 7 Nov 2023 18:08:25 +0500 Subject: [PATCH 2/4] Add versions to prerequisites name (#41) --- install/win/DocSpace.aip | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/install/win/DocSpace.aip b/install/win/DocSpace.aip index d108500bd7..da79c53627 100644 --- a/install/win/DocSpace.aip +++ b/install/win/DocSpace.aip @@ -1569,7 +1569,7 @@ - + @@ -1577,8 +1577,8 @@ - - + + @@ -1589,15 +1589,15 @@ - - + + - + From 50442a67ae41b6a3253e5e356e501d88e5ad45e7 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 7 Nov 2023 17:26:26 +0300 Subject: [PATCH 3/4] Modify build yarn version (#42) * Fix yarn build * Add for Web.Studio eventsBus --- install/common/build-backend.sh | 5 +++-- install/docker/Dockerfile.app | 4 ++-- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/install/common/build-backend.sh b/install/common/build-backend.sh index 87fdcbcd97..88d7715d73 100644 --- a/install/common/build-backend.sh +++ b/install/common/build-backend.sh @@ -42,10 +42,11 @@ done echo "== BACK-END-BUILD ==" -cd ${SRC_PATH} +cd ${SRC_PATH}/server dotnet build ASC.Web.slnf ${ARGS} dotnet build ASC.Migrations.sln -o ${SRC_PATH}/ASC.Migration.Runner/service/ +cd ${SRC_PATH}/client # Array of names backend services in directory common (Nodejs) services_name_backend_nodejs=() services_name_backend_nodejs+=(ASC.Socket.IO) @@ -54,5 +55,5 @@ services_name_backend_nodejs+=(ASC.SsoAuth) # Build backend services (Nodejs) for i in ${!services_name_backend_nodejs[@]}; do echo "== Build ${services_name_backend_nodejs[$i]} project ==" - yarn install --cwd common/${services_name_backend_nodejs[$i]} --frozen-lockfile + yarn install --cwd ${SRC_PATH}/server/common/${services_name_backend_nodejs[$i]} --frozen-lockfile done diff --git a/install/docker/Dockerfile.app b/install/docker/Dockerfile.app index 5ee20f103f..21d7eaa815 100644 --- a/install/docker/Dockerfile.app +++ b/install/docker/Dockerfile.app @@ -56,7 +56,7 @@ RUN cd ${SRC_PATH} && \ sed -e 's/#//' -i /etc/nginx/conf.d/onlyoffice.conf && \ 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}/server" && \ + bash build-backend.sh -sp "${SRC_PATH}" && \ bash publish-backend.sh -pc "${PUBLISH_CNF}" -sp "${SRC_PATH}/server" -bp "${BUILD_PATH}" && \ cp -rf ${SRC_PATH}/server/products/ASC.Files/Server/DocStore ${BUILD_PATH}/products/ASC.Files/server/ && \ rm -rf ${SRC_PATH}/server/common/* && \ @@ -312,7 +312,7 @@ WORKDIR ${BUILD_PATH}/studio/ASC.Web.Studio/ COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.Studio/service/ . -CMD ["ASC.Web.Studio.dll", "ASC.Web.Studio"] +CMD ["ASC.Web.Studio.dll", "ASC.Web.Studio", "core:eventBus:subscriptionClientName=asc_event_bus_webstudio_queue"] ## ASC.Web.HealthChecks.UI ## FROM dotnetrun AS healthchecks From 4af0dc486d36884192b41a97e28b3470e6b386f1 Mon Sep 17 00:00:00 2001 From: Sergey Kirichenko Date: Tue, 7 Nov 2023 19:39:48 +0300 Subject: [PATCH 4/4] Add fix path for migration runner service build (#43) * Fix yarn build * Fix build migration path --- install/common/build-backend.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/install/common/build-backend.sh b/install/common/build-backend.sh index 88d7715d73..c748b3081a 100644 --- a/install/common/build-backend.sh +++ b/install/common/build-backend.sh @@ -44,7 +44,7 @@ echo "== BACK-END-BUILD ==" cd ${SRC_PATH}/server dotnet build ASC.Web.slnf ${ARGS} -dotnet build ASC.Migrations.sln -o ${SRC_PATH}/ASC.Migration.Runner/service/ +dotnet build ASC.Migrations.sln -o ${SRC_PATH}/server/ASC.Migration.Runner/service/ cd ${SRC_PATH}/client # Array of names backend services in directory common (Nodejs)