Merge branch 'release/v2.5.0' into feature/logo-handler

.github/workflows/ci-oci-install.yml

@@ -5,6 +5,8 @@ on:
     types: [opened, reopened, synchronize]
     paths:
       - 'install/OneClickInstall/**'
+      - '!install/OneClickInstall/install-Docker.sh'
+      - '!install/OneClickInstall/docspace-install.sh'
 
   schedule:
     - cron: '00 20 * * 6'  # At 23:00 on Saturday.

config/autofac.consumers.json

@@ -146,9 +146,7 @@
 			"dropboxClientSecret": ""
 		  },
 		  "additional": {
-			"dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx",
-			"dropboxappkey" : "",
-			"dropboxappsecret" : ""
+			"dropboxRedirectUrl" : "https://service.teamlab.info/oauth2.aspx"
 		  }
 	  }
     },

install/OneClickInstall/docspace-install.sh

@@ -35,6 +35,7 @@ PARAMETERS="$PARAMETERS -it COMMUNITY";
 DOCKER="";
 LOCAL_SCRIPTS="false"
 product="docspace"
+product_sysname="onlyoffice";
 FILE_NAME="$(basename "$0")"
 
 while [ "$1" != "" ]; do
@@ -104,7 +105,7 @@ install_curl () {
 }
 
 read_installation_method () {
-	echo "Select 'Y' to install ONLYOFFICE $product using Docker (recommended). Select 'N' to install it using RPM/DEB packages.";
+	echo "Select 'Y' to install ${product_sysname^^} $product using Docker (recommended). Select 'N' to install it using RPM/DEB packages.";
 	read -p "Install with Docker [Y/N/C]? " choice
 	case "$choice" in
 		y|Y )
@@ -135,14 +136,22 @@ if ! command_exists curl ; then
 	install_curl;
 fi
 
+if command_exists docker &> /dev/null && docker ps -a --format '{{.Names}}' | grep -q "${product_sysname}-api"; then
+    DOCKER="true"
+elif command_exists apt-get &> /dev/null && dpkg -s ${product}-api >/dev/null 2>&1; then
+    DOCKER="false"
+elif command_exists yum &> /dev/null && rpm -q ${product}-api >/dev/null 2>&1; then
+    DOCKER="false"
+fi
+ 
 if [ -z "$DOCKER" ]; then
 	read_installation_method;
 fi
 
 if [ -z $GIT_BRANCH ]; then
-	DOWNLOAD_URL_PREFIX="https://download.onlyoffice.com/${product}"
+	DOWNLOAD_URL_PREFIX="https://download.${product_sysname}.com/${product}"
 else
-	DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${product}-buildtools/${GIT_BRANCH}/install/OneClickInstall"
+	DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/${product_sysname^^}/${product}-buildtools/${GIT_BRANCH}/install/OneClickInstall"
 fi
 
 if [ "$DOCKER" == "true" ]; then

install/docker/Dockerfile.app

@@ -249,6 +249,13 @@ FROM dotnetrun AS files_services
 ENV LD_LIBRARY_PATH=/usr/local/lib:/usr/local/lib64
 WORKDIR ${BUILD_PATH}/products/ASC.Files/service/
 
+RUN  echo "deb http://security.ubuntu.com/ubuntu focal-security main" | tee /etc/apt/sources.list && \
+     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 3B4FE6ACC0B21F32 && \
+     apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 871920D1991BC93C && \
+     apt-get -y update && \
+     apt-get install -yq libssl1.1 && \
+     rm -rf /var/lib/apt/lists/*
+
 COPY --chown=onlyoffice:onlyoffice docker-entrypoint.py ./docker-entrypoint.py
 COPY --from=base --chown=onlyoffice:onlyoffice ${BUILD_PATH}/services/ASC.Files.Service/service/ .
 COPY --from=onlyoffice/ffvideo:6.0 --chown=onlyoffice:onlyoffice /usr/local /usr/local/