Merge branch 'develop' into feature/file-folder-selectors

build/install/common/build-backend.sh

@@ -44,11 +44,15 @@ echo "== BACK-END-BUILD =="
 cd ${SRC_PATH}
 dotnet build ASC.Web.sln ${ARGS} 
 
-echo "== Build ASC.Thumbnails =="
-yarn install --cwd common/ASC.Thumbnails --frozen-lockfile
 
-echo "== Build ASC.UrlShortener =="
-yarn install --cwd common/ASC.UrlShortener --frozen-lockfile
+# Array of names backend services in directory common (Nodejs)  
+services_name_backend_nodejs=(ASC.Thumbnails)
+services_name_backend_nodejs+=(ASC.UrlShortener)
+services_name_backend_nodejs+=(ASC.Socket.IO)
+services_name_backend_nodejs+=(ASC.SsoAuth)
 
-echo "== Build ASC.Socket.IO =="
-yarn install --cwd common/ASC.Socket.IO --frozen-lockfile
+# 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
+done

build/install/common/publish-backend.sh

@@ -68,7 +68,7 @@ for i in ${!servers_products_name_backend[@]}; do
   echo "== Publish ${servers_products_name_backend[$i]}.csproj project =="
   SERVICE_DIR="$(dirname "$(find ${SRC_PATH} -type f -name "${servers_products_name_backend[$i]}".csproj)")"
   cd ${SERVICE_DIR}
-  dotnet publish -c Release --self-contained ${SELF_CONTAINED} ${ARGS} --no-build -o ${BUILD_PATH}/products/${servers_products_name_backend[$i]}/server/
+  dotnet publish -c Release --self-contained ${SELF_CONTAINED} ${ARGS} -o ${BUILD_PATH}/products/${servers_products_name_backend[$i]}/server/
 done
 
 # Array of names backend services
@@ -85,24 +85,26 @@ services_name_backend+=(ASC.Thumbnails.Svc)
 services_name_backend+=(ASC.UrlShortener.Svc)
 services_name_backend+=(ASC.Web.Api)
 services_name_backend+=(ASC.Web.Studio)
+services_name_backend+=(ASC.SsoAuth.Svc)
 
 # Publish backend services
 for i in ${!services_name_backend[@]}; do
   echo "== Publish ${services_name_backend[$i]}.csproj project =="
   SERVICE_DIR="$(dirname "$(find ${SRC_PATH} -type f -name "${services_name_backend[$i]}".csproj)")"
   cd ${SERVICE_DIR}
-  dotnet publish -c Release --self-contained ${SELF_CONTAINED} ${ARGS} --no-build -o ${BUILD_PATH}/services/${services_name_backend[$i]}/service/
+  dotnet publish -c Release --self-contained ${SELF_CONTAINED} ${ARGS} -o ${BUILD_PATH}/services/${services_name_backend[$i]}/service/
 done
 
 # Array of names backend services in directory common (Nodejs)  
-services_name_frontend=(ASC.Thumbnails)
-services_name_frontend+=(ASC.UrlShortener)
-services_name_frontend+=(ASC.Socket.IO)
+services_name_backend_nodejs=(ASC.Thumbnails)
+services_name_backend_nodejs+=(ASC.UrlShortener)
+services_name_backend_nodejs+=(ASC.Socket.IO)
+services_name_backend_nodejs+=(ASC.SsoAuth)
 
 # Publish backend services (Nodejs) 
-for i in ${!services_name_frontend[@]}; do
-  echo "== Publish ${services_name_frontend[$i]} project =="
-  SERVICE_DIR="$(find ${SRC_PATH} -type d -name ${services_name_frontend[$i]})"
+for i in ${!services_name_backend_nodejs[@]}; do
+  echo "== Publish ${services_name_backend_nodejs[$i]} project =="
+  SERVICE_DIR="$(find ${SRC_PATH} -type d -name ${services_name_backend_nodejs[$i]})"
   cd ${SERVICE_DIR}
-  mkdir -p ${BUILD_PATH}/services/${services_name_frontend[$i]}/service/ && cp -arfv ./* ${BUILD_PATH}/services/${services_name_frontend[$i]}/service/
+  mkdir -p ${BUILD_PATH}/services/${services_name_backend_nodejs[$i]}/service/ && cp -arfv ./* ${BUILD_PATH}/services/${services_name_backend_nodejs[$i]}/service/
 done

build/install/common/systemd/service

@@ -3,8 +3,7 @@ Description=AppServer-${SERVICE_NAME}
 After=network.target syslog.target
 
 [Service]
-PIDFile=/run/appserver/appserver-${SERVICE_NAME}.pid
-Type=simple
+Type=notify
 User=onlyoffice
 Group=onlyoffice
 WorkingDirectory=${WORK_DIR}

build/install/docker/.env

@@ -64,6 +64,7 @@
     URLSHORTENER_HOST=${CONTAINER_PREFIX}urlshortener
     API_HOST=${CONTAINER_PREFIX}api
     STUDIO_HOST=${CONTAINER_PREFIX}studio
+    SSOAUTH_HOST=${CONTAINER_PREFIX}ssoauth
     PROXY_HOST=${CONTAINER_PREFIX}proxy
 
 # proxy upstream environment #
@@ -86,5 +87,6 @@
     SERVICE_URLSHORTENER=${URLSHORTENER_HOST}:9999
     SERVICE_API=${API_HOST}:${SERVICE_PORT}
     SERVICE_STUDIO=${STUDIO_HOST}:${SERVICE_PORT}
+    SERVICE_SSOAUTH=${SSOAUTH_HOST}:9834
     
     NETWORK_NAME=${PRODUCT}

build/install/docker/Dockerfile-app

@@ -282,7 +282,7 @@ WORKDIR ${BUILD_PATH}/services/thumb/service/
 
 COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
 COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Thumbnails.Svc/service/ .
-COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Thumbnails/service/ /var/www/services/thumb/client
+COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Thumbnails/service/ ${BUILD_PATH}/services/thumb/client
 
 CMD ["ASC.Thumbnails.Svc.dll", "ASC.Thumbnails.Svc"]
 
@@ -292,7 +292,7 @@ WORKDIR  ${BUILD_PATH}/services/urlshortener/service/
 
 COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
 COPY --from=base --chown=onlyoffice:onlyoffice  ${BUILD_PATH}/services/ASC.UrlShortener.Svc/service/ .
-COPY --from=base --chown=onlyoffice:onlyoffice  ${BUILD_PATH}/services/ASC.UrlShortener/service/ /var/www/services/urlshortener/client
+COPY --from=base --chown=onlyoffice:onlyoffice  ${BUILD_PATH}/services/ASC.UrlShortener/service/ ${BUILD_PATH}/services/urlshortener/client
 
 CMD ["ASC.UrlShortener.Svc.dll", "ASC.UrlShortener.Svc"]
 
@@ -314,6 +314,16 @@ COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Web.St
 
 CMD ["ASC.Web.Studio.dll", "ASC.Web.Studio"]
 
+## ASC.SsoAuth ##
+FROM builder AS ssoauth
+WORKDIR ${BUILD_PATH}/services/ASC.SsoAuth.Svc/
+
+COPY --chown=onlyoffice:onlyoffice docker-entrypoint.sh .
+COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.SsoAuth.Svc/service/ .
+COPY --from=base --chown=onlyoffice:onlyoffice  ${BUILD_PATH}/services/ASC.SsoAuth/service/ ${BUILD_PATH}/ASC.SsoAuth/
+
+CMD ["ASC.SsoAuth.Svc.dll", "ASC.SsoAuth.Svc"]
+
 ## image for k8s bin-share ##
 FROM busybox:latest AS bin_share
 RUN mkdir -p /app/appserver/ASC.Files/server && \

build/install/docker/appserver.yml

@@ -187,6 +187,14 @@ services:
     image: "${REPO}/${STATUS}appserver-studio:${SRV_VERSION}"
     container_name: ${STUDIO_HOST}
    
+  onlyoffice-ssoauth:
+    <<: *x-service-base
+    image: "${REPO}/${STATUS}appserver-ssoauth:${SRV_VERSION}"
+    container_name: ${SSOAUTH_HOST}
+    expose:
+    - ${SERVICE_PORT}
+    - "9834"
+
   onlyoffice-proxy:
     image: "${REPO}/${STATUS}appserver-proxy:${SRV_VERSION}"
     container_name: ${PROXY_HOST}
@@ -216,6 +224,7 @@ services:
       - onlyoffice-urlshortener
       - onlyoffice-api
       - onlyoffice-studio
+      - onlyoffice-ssoauth
     environment:
       - SERVICE_API_SYSTEM=${SERVICE_API_SYSTEM}
       - SERVICE_BACKUP=${SERVICE_BACKUP}
@@ -236,6 +245,7 @@ services:
       - SERVICE_URLSHORTENER=${SERVICE_URLSHORTENER}
       - SERVICE_API=${SERVICE_API}
       - SERVICE_STUDIO=${SERVICE_STUDIO}
+      - SERVICE_SSOAUTH=${SERVICE_SSOAUTH}
       - DOCUMENT_SERVER=${DOCUMENT_SERVER_HOST}
       - SERVICE_PORT=${SERVICE_PORT}
     volumes:

build/install/docker/build.yml

@@ -134,6 +134,13 @@ services:
       target: studio
     image: "${REPO}/${STATUS}appserver-studio:${SRV_VERSION}"
 
+  onlyoffice-ssoauth:
+    build:
+      context: ./
+      dockerfile: "${DOCKERFILE}"
+      target: ssoauth
+    image: "${REPO}/${STATUS}appserver-ssoauth:${SRV_VERSION}"
+
   onlyoffice-bin-share:
     build:
       context: ./