From a7ebccb5cb2fc0d8239df726ed39617f6708c2bb Mon Sep 17 00:00:00 2001
From: Sergey Kirichenko <sk81.biz@gmail.com>
Date: Thu, 28 Jul 2022 15:33:03 +0300
Subject: [PATCH] Add doceditor docker service (#742)

* Add docker doceditor service

* fix

* Cosmetic modify

* Cosmetic modify

Co-authored-by: Alexey Golubev <alexey.golubev@onlyoffice.com>
---
 build/install/docker/.env                             |  2 ++
 build/install/docker/Dockerfile.app                   | 11 ++++++++++-
 build/install/docker/appserver.yml                    |  8 ++++++++
 build/install/docker/build.yml                        |  7 +++++++
 .../config/nginx/templates/upstream.conf.template     |  5 +++++
 5 files changed, 32 insertions(+), 1 deletion(-)

diff --git a/build/install/docker/.env b/build/install/docker/.env
index f29df5484d..10f0cfe318 100644
--- a/build/install/docker/.env
+++ b/build/install/docker/.env
@@ -68,6 +68,7 @@
     SSOAUTH_HOST=${CONTAINER_PREFIX}ssoauth
     MIGRATION_RUNNER_HOST=${CONTAINER_PREFIX}migration-runner
     PROXY_HOST=${CONTAINER_PREFIX}proxy
+    DOCEDITOR_HOST=${CONTAINER_PREFIX}doceditor
 
 # proxy upstream environment #
     SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT}
@@ -89,5 +90,6 @@
     SERVICE_API=${API_HOST}:${SERVICE_PORT}
     SERVICE_STUDIO=${STUDIO_HOST}:${SERVICE_PORT}
     SERVICE_SSOAUTH=${SSOAUTH_HOST}:${SERVICE_PORT}
+    SERVICE_DOCEDITOR=${DOCEDITOR_HOST}:5013
     
     NETWORK_NAME=${PRODUCT}
diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app
index 016a978de9..bb8b171479 100644
--- a/build/install/docker/Dockerfile.app
+++ b/build/install/docker/Dockerfile.app
@@ -135,7 +135,7 @@ RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
 # 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/products ${BUILD_PATH}/products
+COPY --from=base ${SRC_PATH}/build/deploy/products/ASC.Files/client ${BUILD_PATH}/products/ASC.Files/client
 COPY --from=base ${SRC_PATH}/build/deploy/public ${BUILD_PATH}/public
 COPY --from=base ${SRC_PATH}/build/deploy/studio ${BUILD_PATH}/studio
 COPY /config/nginx/templates/upstream.conf.template /etc/nginx/templates/upstream.conf.template
@@ -160,8 +160,17 @@ RUN chown nginx:nginx /etc/nginx/* -R && \
     sed -i 's/localhost:5022/$service_mail/' /etc/nginx/conf.d/onlyoffice.conf && \
     sed -i 's/localhost:9999/$service_urlshortener/' /etc/nginx/conf.d/onlyoffice.conf && \
     sed -i 's/localhost:5034/$service_migration/' /etc/nginx/conf.d/onlyoffice.conf && \
+    sed -i 's/localhost:5013/$service_doceditor/' /etc/nginx/conf.d/onlyoffice.conf && \
     sed -i 's/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf
 
+## Doceditor ##
+FROM nodeBuild as doceditor
+WORKDIR ${BUILD_PATH}/products/ASC.Files/editor
+
+COPY --from=base --chown=onlyoffice:onlyoffice ${SRC_PATH}/build/deploy/products/ASC.Files/editor/ .
+EXPOSE 5013
+ENTRYPOINT ["node", "server.js"]
+
 ## ASC.Data.Backup.BackgroundTasks ##
 FROM builder AS backup_background
 WORKDIR ${BUILD_PATH}/services/ASC.Data.Backup.BackgroundTasks/
diff --git a/build/install/docker/appserver.yml b/build/install/docker/appserver.yml
index 3df3437b87..ecc474a534 100644
--- a/build/install/docker/appserver.yml
+++ b/build/install/docker/appserver.yml
@@ -132,6 +132,13 @@ services:
     image: "${REPO}/${STATUS}appserver-webhooks-service:${DOCKER_TAG}"
     container_name: ${WEBHOOKS_SERVICE_HOST}  
 
+  onlyoffice-doceditor:
+    image: "${REPO}/${STATUS}appserver-doceditor:${DOCKER_TAG}"
+    container_name: ${DOCEDITOR_HOST}
+    restart: always
+    expose:
+      - "5013"
+
   onlyoffice-proxy:
     image: "${REPO}/${STATUS}appserver-proxy:${DOCKER_TAG}"
     container_name: ${PROXY_HOST}
@@ -174,6 +181,7 @@ services:
       - SERVICE_API=${SERVICE_API}
       - SERVICE_STUDIO=${SERVICE_STUDIO}
       - SERVICE_SSOAUTH=${SERVICE_SSOAUTH}
+      - SERVICE_DOCEDITOR=${SERVICE_DOCEDITOR}
       - DOCUMENT_SERVER=${DOCUMENT_SERVER_HOST}
       - SERVICE_PORT=${SERVICE_PORT}
     volumes:
diff --git a/build/install/docker/build.yml b/build/install/docker/build.yml
index e320c7e1fa..504c4a63fa 100644
--- a/build/install/docker/build.yml
+++ b/build/install/docker/build.yml
@@ -127,6 +127,13 @@ services:
       target: wait_bin_share
     image: "${REPO}/${STATUS}appserver-wait-bin-share:${DOCKER_TAG}"
 
+  onlyoffice-doceditor:
+    build:
+      context:  ./
+      dockerfile: "${DOCKERFILE}"
+      target: doceditor
+    image: "${REPO}/${STATUS}appserver-doceditor:${DOCKER_TAG}"
+
   onlyoffice-proxy:
     build:
       context:  ./
diff --git a/build/install/docker/config/nginx/templates/upstream.conf.template b/build/install/docker/config/nginx/templates/upstream.conf.template
index 54153917c8..8690f5c4f1 100644
--- a/build/install/docker/config/nginx/templates/upstream.conf.template
+++ b/build/install/docker/config/nginx/templates/upstream.conf.template
@@ -1,5 +1,10 @@
 resolver $DNS_NAMESERVER valid=30s;
 
+map $SERVICE_DOCEDITOR $service_doceditor {
+    volatile;
+    $SERVICE_DOCEDITOR $SERVICE_DOCEDITOR;
+}
+
 map $SERVICE_MIGRATION $service_migration {
     volatile;
     $SERVICE_MIGRATION $SERVICE_MIGRATION;