Merge branch 'feature/virtual-rooms-1.2' into feature/info-panel

# Conflicts:
#	packages/asc-web-common/components/Section/sub-components/section-container.js

build/install/common/publish-backend.sh

@@ -56,12 +56,8 @@ while [ "$1" != "" ]; do
 done
 
 # Array of names server in directory products
-servers_products_name_backend=(ASC.CRM)
 servers_products_name_backend+=(ASC.Files)
 servers_products_name_backend+=(ASC.People)
-servers_products_name_backend+=(ASC.Projects)
-servers_products_name_backend+=(ASC.Calendar)
-servers_products_name_backend+=(ASC.Mail)
 
 # Publish server backend products
 for i in ${!servers_products_name_backend[@]}; do

build/install/docker/.env

@@ -44,20 +44,17 @@
     MYSQL_USER=${PRODUCT}_user
     MYSQL_PASSWORD=${PRODUCT}_pass
     MYSQL_HOST=${CONTAINER_PREFIX}mysql-server
+    DATABASE_MIGRATION=false
 
 # service host #
     API_SYSTEM_HOST=${CONTAINER_PREFIX}api-system
     BACKUP_HOST=${CONTAINER_PREFIX}backup
-    CALENDAR_HOST=${CONTAINER_PREFIX}calendar
-    CRM_HOST=${CONTAINER_PREFIX}crm
     STORAGE_ENCRYPTION_HOST=${CONTAINER_PREFIX}storage-encryption
     FILES_HOST=${CONTAINER_PREFIX}files
     FILES_SERVICES_HOST=${CONTAINER_PREFIX}files-services
-    MAIL_HOST=${CONTAINER_PREFIX}mail
     STORAGE_MIGRATION_HOST=${CONTAINER_PREFIX}storage-migration
     NOTIFY_HOST=${CONTAINER_PREFIX}notify
     PEOPLE_SERVER_HOST=${CONTAINER_PREFIX}people-server
-    PROJECTS_SERVER_HOST=${CONTAINER_PREFIX}projects-server
     SOCKET_HOST=${CONTAINER_PREFIX}socket
     STUDIO_NOTIFY_HOST=${CONTAINER_PREFIX}studio-notify
     TELEGRAM_SERVICE_HOST=${CONTAINER_PREFIX}telegram-service
@@ -71,16 +68,12 @@
 # proxy upstream environment #
     SERVICE_API_SYSTEM=${API_SYSTEM_HOST}:${SERVICE_PORT}
     SERVICE_BACKUP=${BACKUP_HOST}:${SERVICE_PORT}
-    SERVICE_CRM=${CRM_HOST}:${SERVICE_PORT}
-    SERVICE_CALENDAR=${CALENDAR_HOST}:${SERVICE_PORT}
     SERVICE_STORAGE_ENCRYPTION=${STORAGE_ENCRYPTION_HOST}:${SERVICE_PORT}
     SERVICE_FILES=${FILES_HOST}:${SERVICE_PORT}
     SERVICE_FILES_SERVICES=${FILES_SERVICES_HOST}:${SERVICE_PORT}
-    SERVICE_MAIL=${MAIL_HOST}:${SERVICE_PORT}
     SERVICE_STORAGE_MIGRATION=${STORAGE_MIGRATION_HOST}:${SERVICE_PORT}
     SERVICE_NOTIFY=${NOTIFY_HOST}:${SERVICE_PORT}
     SERVICE_PEOPLE_SERVER=${PEOPLE_SERVER_HOST}:${SERVICE_PORT}
-    SERVICE_PROJECTS_SERVER=${PROJECTS_SERVER_HOST}:${SERVICE_PORT}
     SERVICE_SOCKET=${SOCKET_HOST}:9899
     SERVICE_STUDIO_NOTIFY=${STUDIO_NOTIFY_HOST}:${SERVICE_PORT}
     SERVICE_TELEGRAM_SERVICE=${TELEGRAM_SERVICE_HOST}:${SERVICE_PORT}

build/install/docker/Dockerfile.app

@@ -1,10 +1,12 @@
 ### STAGE 1: Base image ######
 ARG SRC_PATH=/app/onlyoffice/src
 ARG BUILD_PATH=/var/www
-ARG REPO_TAG=5.0.202-focal-amd64
-ARG REPO=mcr.microsoft.com/dotnet/sdk
+ARG REPO_SDK=mcr.microsoft.com/dotnet/sdk
+ARG REPO_SDK_TAG=6.0
+ARG REPO_RUN=mcr.microsoft.com/dotnet/aspnet
+ARG REPO_RUN_TAG=6.0
 
-FROM $REPO:$REPO_TAG AS base
+FROM $REPO_SDK:$REPO_SDK_TAG AS base
 ARG RELEASE_DATE="2016-06-21"
 ARG DEBIAN_FRONTEND=noninteractive
 ARG PRODUCT_VERSION=0.0.0
@@ -67,7 +69,7 @@ COPY config/mysql/conf.d/mysql.cnf /etc/mysql/conf.d/mysql.cnf
 RUN rm -rf /var/lib/apt/lists/*
 
 ### STAGE 2: Build ###
-FROM mcr.microsoft.com/dotnet/aspnet:5.0.4-focal-amd64 as builder
+FROM $REPO_RUN:$REPO_RUN_TAG as builder
 ARG BUILD_PATH
 ENV BUILD_PATH=${BUILD_PATH}
 
@@ -159,24 +161,6 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Data.B
 
 CMD ["ASC.Data.Backup.dll", "ASC.Data.Backup", "core:products:folder=/var/www/products/", "core:products:subfolder=server"]
 
-## ASC.Calendar ##
-FROM builder AS calendar
-WORKDIR ${BUILD_PATH}/products/ASC.Calendar/server/
-
-COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
-COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/products/ASC.Calendar/server/ .
-
-CMD ["ASC.Calendar.dll", "ASC.Calendar"]
-
-## ASC.CRM ##
-FROM builder AS crm
-WORKDIR ${BUILD_PATH}/products/ASC.CRM/server/
-
-COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
-COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/products/ASC.CRM/server/ .
-
-CMD ["ASC.CRM.dll", "ASC.CRM"]
-
 ## ASC.Data.Storage.Encryption ##
 FROM builder AS data_storage_encryption
 WORKDIR ${BUILD_PATH}/services/storage.encryption/
@@ -204,15 +188,6 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.
 
 CMD ["ASC.Files.Service.dll", "ASC.Files.Service", "core:products:folder=/var/www/products/", "core:products:subfolder=server", "disable_elastic=true"]
 
-## ASC.Mail ##
-FROM builder AS mail
-WORKDIR ${BUILD_PATH}/products/ASC.Mail/server/
-
-COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
-COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/products/ASC.Mail/server/ .
-
-CMD ["ASC.Mail.dll", "ASC.Mail"]
-
 ## ASC.Data.Storage.Migration ##
 FROM builder AS data_storage_migration
 WORKDIR ${BUILD_PATH}/services/storage.migration/service/
@@ -240,15 +215,6 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/products/ASC.People
 
 CMD ["ASC.People.dll", "ASC.People"]
 
-## ASC.Projects ##
-FROM builder AS projects_server
-WORKDIR ${BUILD_PATH}/products/ASC.Projects/server/
-
-COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
-COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/products/ASC.Projects/server/ .
-
-CMD ["ASC.Projects.dll", "ASC.Projects"]
-
 ## ASC.Socket.IO.Svc ##
 FROM builder AS socket
 WORKDIR ${BUILD_PATH}/services/socket.io.svc/
@@ -339,10 +305,10 @@ RUN mkdir -p /app/appserver/ASC.Files/server && \
 COPY bin-share-docker-entrypoint.sh /app/docker-entrypoint.sh
 COPY --from=base /var/www/products/ASC.Files/server/ /app/appserver/ASC.Files/server/
 COPY --from=base /var/www/products/ASC.People/server/ /app/appserver/ASC.People/server/
-COPY --from=base /var/www/products/ASC.CRM/server/ /app/appserver/ASC.CRM/server/
-COPY --from=base /var/www/products/ASC.Projects/server/ /app/appserver/ASC.Projects/server/
-COPY --from=base /var/www/products/ASC.Calendar/server/ /app/appserver/ASC.Calendar/server/
-COPY --from=base /var/www/products/ASC.Mail/server/ /app/appserver/ASC.Mail/server/
+# COPY --from=base /var/www/products/ASC.CRM/server/ /app/appserver/ASC.CRM/server/
+# COPY --from=base /var/www/products/ASC.Projects/server/ /app/appserver/ASC.Projects/server/
+# COPY --from=base /var/www/products/ASC.Calendar/server/ /app/appserver/ASC.Calendar/server/
+# COPY --from=base /var/www/products/ASC.Mail/server/ /app/appserver/ASC.Mail/server/
 ENTRYPOINT ["./app/docker-entrypoint.sh"]
 
 ## image for k8s wait-bin-share ##

build/install/docker/appserver.yml

@@ -1,4 +1,4 @@
-version: "3.6"
+version: "3.8"
 x-service: 
     &x-service-base
     container_name: base
@@ -11,6 +11,7 @@ x-service:
       MYSQL_DATABASE: ${MYSQL_DATABASE}
       MYSQL_USER: ${MYSQL_USER}
       MYSQL_PASSWORD: ${MYSQL_PASSWORD}
+      DATABASE_MIGRATION: ${DATABASE_MIGRATION}
       APP_DOTNET_ENV: ${APP_DOTNET_ENV}
       APP_CORE_BASE_DOMAIN: ${APP_CORE_BASE_DOMAIN}
       APP_CORE_MACHINEKEY: ${APP_CORE_MACHINEKEY}
@@ -26,10 +27,6 @@ x-service:
     - app_data:/app/onlyoffice/data
     - files_data:/var/www/products/ASC.Files/server/
     - people_data:/var/www/products/ASC.People/server/
-    - crm_data:/var/www/products/ASC.CRM/server/
-    - project_data:/var/www/products/ASC.Projects/server/
-    - calendar_data:/var/www/products/ASC.Calendar/server/
-    - mail_data:/var/www/products/ASC.Mail/server/
 
 services: 
   onlyoffice-elasticsearch:
@@ -63,16 +60,6 @@ services:
     image: "${REPO}/${STATUS}appserver-backup:${DOCKER_TAG}"
     container_name: ${BACKUP_HOST}
 
-  onlyoffice-calendar:
-    <<: *x-service-base
-    image: "${REPO}/${STATUS}appserver-calendar:${DOCKER_TAG}"
-    container_name: ${CALENDAR_HOST}
-
-  onlyoffice-crm:
-    <<: *x-service-base
-    image: "${REPO}/${STATUS}appserver-crm:${DOCKER_TAG}"
-    container_name: ${CRM_HOST}
-
   onlyoffice-storage-encryption:
     <<: *x-service-base
     image: "${REPO}/${STATUS}appserver-storage-encryption:${DOCKER_TAG}"
@@ -88,11 +75,6 @@ services:
     image: "${REPO}/${STATUS}appserver-files-services:${DOCKER_TAG}"
     container_name: ${FILES_SERVICES_HOST}
 
-  onlyoffice-mail:
-    <<: *x-service-base
-    image: "${REPO}/${STATUS}appserver-mail:${DOCKER_TAG}"
-    container_name: ${MAIL_HOST}
-
   onlyoffice-storage-migration:
     <<: *x-service-base
     image: "${REPO}/${STATUS}appserver-storage-migration:${DOCKER_TAG}"
@@ -103,11 +85,6 @@ services:
     image: "${REPO}/${STATUS}appserver-people-server:${DOCKER_TAG}"
     container_name: ${PEOPLE_SERVER_HOST}
 
-  onlyoffice-projects-server:
-    <<: *x-service-base
-    image: "${REPO}/${STATUS}appserver-projects-server:${DOCKER_TAG}"
-    container_name: ${PROJECTS_SERVER_HOST}
-
   onlyoffice-socket:
     <<: *x-service-base
     image: "${REPO}/${STATUS}appserver-socket:${DOCKER_TAG}"
@@ -173,15 +150,11 @@ services:
     depends_on:
       - onlyoffice-api-system
       - onlyoffice-backup
-      - onlyoffice-calendar
-      - onlyoffice-crm
       - onlyoffice-storage-encryption
       - onlyoffice-files
       - onlyoffice-files-services
-      - onlyoffice-mail
       - onlyoffice-storage-migration
       - onlyoffice-people-server
-      - onlyoffice-projects-server
       - onlyoffice-socket
       - onlyoffice-studio-notify
       - onlyoffice-telegram-service
@@ -193,16 +166,12 @@ services:
     environment:
       - SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
       - SERVICE_BACKUP=${SERVICE_BACKUP}
-      - SERVICE_CALENDAR=${SERVICE_CALENDAR}
-      - SERVICE_CRM=${SERVICE_CRM}
       - SERVICE_STORAGE_ENCRYPTION=${SERVICE_STORAGE_ENCRYPTION}
       - SERVICE_FILES=${SERVICE_FILES}
       - SERVICE_FILES_SERVICES=${SERVICE_FILES_SERVICES}
-      - SERVICE_MAIL=${SERVICE_MAIL}
       - SERVICE_STORAGE_MIGRATION=${SERVICE_STORAGE_MIGRATION}
       - SERVICE_NOTIFY=${SERVICE_NOTIFY}
       - SERVICE_PEOPLE_SERVER=${SERVICE_PEOPLE_SERVER}
-      - SERVICE_PROJECTS_SERVER=${SERVICE_PROJECTS_SERVER}
       - SERVICE_SOCKET=${SERVICE_SOCKET}
       - SERVICE_STUDIO_NOTIFY=${SERVICE_STUDIO_NOTIFY}
       - SERVICE_TELEGRAM_SERVICE=${SERVICE_TELEGRAM_SERVICE}
@@ -227,7 +196,3 @@ volumes:
   app_data:
   files_data:
   people_data:
-  crm_data:
-  project_data:
-  calendar_data:
-  mail_data:

build/install/docker/build.yml

@@ -1,4 +1,4 @@
-version: "3.6"
+version: "3.8"
 
 services: 
   onlyoffice-api-system:
@@ -14,21 +14,7 @@ services:
       dockerfile: "${DOCKERFILE}"
       target: backup
     image: "${REPO}/${STATUS}appserver-backup:${DOCKER_TAG}"
-
-  onlyoffice-calendar:
-    build:
-      context: ./
-      dockerfile: "${DOCKERFILE}"
-      target: calendar
-    image: "${REPO}/${STATUS}appserver-calendar:${DOCKER_TAG}"
-
-  onlyoffice-crm:
-    build:
-      context: ./
-      dockerfile: "${DOCKERFILE}"
-      target: crm
-    image: "${REPO}/${STATUS}appserver-crm:${DOCKER_TAG}"
-
+
   onlyoffice-storage-encryption:
     build:
       context: ./
@@ -50,13 +36,6 @@ services:
       target: files_services
     image: "${REPO}/${STATUS}appserver-files-services:${DOCKER_TAG}"
 
-  onlyoffice-mail:
-    build:
-      context: ./
-      dockerfile: "${DOCKERFILE}"
-      target: mail
-    image: "${REPO}/${STATUS}appserver-mail:${DOCKER_TAG}"
-
   onlyoffice-storage-migration:
     build:
       context: ./
@@ -77,13 +56,6 @@ services:
       dockerfile: "${DOCKERFILE}"
       target: people_server
     image: "${REPO}/${STATUS}appserver-people-server:${DOCKER_TAG}"
-
-  onlyoffice-projects-server:
-    build:
-      context: ./
-      dockerfile: "${DOCKERFILE}"
-      target: projects_server
-    image: "${REPO}/${STATUS}appserver-projects-server:${DOCKER_TAG}"
 
   onlyoffice-socket:
     build: