Merge pull request #551 from ONLYOFFICE/hotfix/v1.1.1

Hotfix/v1.1.1
ONLYOFFICE · Feb 21, 2022 · dadf439 · dadf439
2 parents 14783ee + df278ba
commit dadf439
Show file tree

Hide file tree

Showing 555 changed files with 10,711 additions and 7,468 deletions.
diff --git a/build/install/OneClickInstall/install-Debian/install-preq.sh b/build/install/OneClickInstall/install-Debian/install-preq.sh
@@ -55,14 +55,16 @@ rm packages-microsoft-prod.deb
 
 #install kafka
 PRODUCT_DIR="/var/www/${product}"
-if [ "$(ls -A "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
+if [ "$(ls "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
 	mkdir -p ${PRODUCT_DIR}/services/
 	if ! cat /etc/passwd | grep -q "kafka"; then
 		adduser --quiet --home ${PRODUCT_DIR}/services/kafka --system kafka
 	fi
 	cd ${PRODUCT_DIR}/services/kafka
-	curl https://downloads.apache.org/kafka/2.7.2/kafka_2.13-2.7.2.tgz -O
-	tar xzf kafka_*.tgz --strip 1 && rm -rf kafka_*.tgz
+	KAFKA_VERSION=$(curl https://downloads.apache.org/kafka/ | grep -Eo '3.1.[0-9]' | tail -1)
+	KAFKA_ARCHIVE=$(curl https://downloads.apache.org/kafka/$KAFKA_VERSION/ | grep -Eo "kafka_2.[0-9][0-9]-$KAFKA_VERSION.tgz" | tail -1)
+	curl https://downloads.apache.org/kafka/$KAFKA_VERSION/$KAFKA_ARCHIVE -O
+	tar xzf $KAFKA_ARCHIVE --strip 1 && rm -rf $KAFKA_ARCHIVE
 	chown -R kafka ${PRODUCT_DIR}/services/kafka
 	cd -
 fi
@@ -107,12 +109,16 @@ if ! dpkg -l | grep -q "mysql-server"; then
 	MYSQL_SERVER_PASS=${MYSQL_SERVER_PASS:-"$(cat /dev/urandom | tr -dc A-Za-z0-9 | head -c 12)"}
 
 	# setup mysql 8.0 package
-	curl -OL http://dev.mysql.com/get/mysql-apt-config_0.8.15-1_all.deb
+	MYSQL_PACKAGE_NAME="mysql-apt-config_0.8.22-1_all.deb"
+	if [ "$DIST" = "debian" ] && [ "$DISTRIB_CODENAME" = "stretch" ]; then
+		MYSQL_PACKAGE_NAME="mysql-apt-config_0.8.16-1_all.deb"
+	fi
+	curl -OL http://dev.mysql.com/get/${MYSQL_PACKAGE_NAME}
 	echo "mysql-apt-config mysql-apt-config/repo-codename  select  $DISTRIB_CODENAME" | debconf-set-selections
 	echo "mysql-apt-config mysql-apt-config/repo-distro  select  $DIST" | debconf-set-selections
 	echo "mysql-apt-config mysql-apt-config/select-server  select  mysql-8.0" | debconf-set-selections
-	DEBIAN_FRONTEND=noninteractive dpkg -i mysql-apt-config_0.8.15-1_all.deb
-	rm -f mysql-apt-config_0.8.15-1_all.deb
+	DEBIAN_FRONTEND=noninteractive dpkg -i ${MYSQL_PACKAGE_NAME}
+	rm -f ${MYSQL_PACKAGE_NAME}
 
 	echo mysql-community-server mysql-community-server/root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections
 	echo mysql-community-server mysql-community-server/re-root-pass password ${MYSQL_SERVER_PASS} | debconf-set-selections

diff --git a/build/install/OneClickInstall/install-Docker.sh b/build/install/OneClickInstall/install-Docker.sh
@@ -70,6 +70,7 @@ KAFKA_HOST=""
 
 ELK_HOST=""
 
+DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/4testing-documentserver-ee:latest
 DOCUMENT_SERVER_JWT_SECRET=""
 DOCUMENT_SERVER_HOST=""
 
@@ -282,6 +283,13 @@ while [ "$1" != "" ]; do
 				shift
 			fi
 		;;
+
+		-di | --documentserverimage )
+			if [ "$2" != "" ]; then
+				DOCUMENT_SERVER_IMAGE_NAME=$2
+				shift
+			fi
+		;;
 
 		-? | -h | --help )
 			echo "  Usage: bash $HELP_TARGET [PARAMETER] [[PARAMETER], ...]"
@@ -291,8 +299,9 @@ while [ "$1" != "" ]; do
 			echo "      -un, --username                   dockerhub username"
 			echo "      -p, --password                    dockerhub password"
 			echo "      -ias, --installappserver          install or update appserver (true|false)"
-			echo "      -vas, --versionappserver          select the version to install appserver (latest|develop|version number)"
+			echo "      -tag, --dockertag                 select the version to install appserver (latest|develop|version number)"
 			echo "      -ids, --installdocumentserver     install or update document server (true|false)"
+			echo "      -di, --documentserverimage        document server image name"
 			echo "      -imysql, --installmysql           install or update mysql (true|false)"			
 			echo "      -ikafka, --installkafka           install or update kafka (true|false)"
 			echo "      -mysqlrp, --mysqlrootpassword     mysql server root password"
@@ -497,8 +506,8 @@ check_hardware () {
 }
 
 install_service () {
-	COMMAND_NAME=$1
-	PACKAGE_NAME=$2
+	local COMMAND_NAME=$1
+	local PACKAGE_NAME=$2
 
 	PACKAGE_NAME=${PACKAGE_NAME:-"$COMMAND_NAME"}
 
@@ -698,8 +707,8 @@ create_network () {
 }
 
 get_container_env_parameter () {
-	CONTAINER_NAME=$1;
-	PARAMETER_NAME=$2;
+	local CONTAINER_NAME=$1;
+	local PARAMETER_NAME=$2;
 	VALUE="";
 
 	if [[ -z ${CONTAINER_NAME} ]]; then
@@ -770,45 +779,28 @@ set_core_machinekey () {
 
 	if [[ -z ${CORE_MACHINEKEY} ]] && [[ "$UPDATE" != "true" ]]; then
 		APP_CORE_MACHINEKEY=$(get_random_str 12);
+		mkdir -p ${BASE_DIR}/.private/
 		echo $APP_CORE_MACHINEKEY > ${BASE_DIR}/.private/machinekey
 	fi
 }
 
 download_files () {
-	mkdir -p ${BASE_DIR}
-	mkdir -p ${BASE_DIR}/.private/
-	mkdir -p ${BASE_DIR}/config/mysql/conf.d/
-
-	if ! command_exists wget; then
-		install_service wget
-	fi
-
-	DOWNLOAD_URL_PREFIX="https://raw.githubusercontent.com/ONLYOFFICE/${PRODUCT}/${GIT_BRANCH}/build/install/docker"
-	wget -q -O $BASE_DIR/.env "${DOWNLOAD_URL_PREFIX}/.env"
-	wget -q -O $BASE_DIR/db.yml "${DOWNLOAD_URL_PREFIX}/db.yml"
-	wget -q -O $BASE_DIR/ds.yml "${DOWNLOAD_URL_PREFIX}/ds.yml"
-	wget -q -O $BASE_DIR/kafka.yml "${DOWNLOAD_URL_PREFIX}/kafka.yml"
-	wget -q -O $BASE_DIR/appserver.yml "${DOWNLOAD_URL_PREFIX}/appserver.yml"
-	wget -q -O $BASE_DIR/config/createdb.sql "${DOWNLOAD_URL_PREFIX}/config/createdb.sql"
-	wget -q -O $BASE_DIR/config/onlyoffice.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.sql"
-	wget -q -O $BASE_DIR/config/onlyoffice.data.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.data.sql"
-	wget -q -O $BASE_DIR/config/mysql/conf.d/mysql.cnf "${DOWNLOAD_URL_PREFIX}/config/mysql/conf.d/mysql.cnf"
-	wget -q -O $BASE_DIR/config/onlyoffice.resources.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.resources.sql"
-	wget -q -O $BASE_DIR/config/onlyoffice.upgradev110.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.upgradev110.sql"
-	wget -q -O $BASE_DIR/config/onlyoffice.upgradev111.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.upgradev111.sql"
-	wget -q -O $BASE_DIR/config/onlyoffice.upgradev115.sql "${DOWNLOAD_URL_PREFIX}/config/onlyoffice.upgradev115.sql"
-
-	if [[ -n ${STATUS} ]]; then
-		sed -i "s/STATUS=.*/STATUS=\"${STATUS}\"/g" $BASE_DIR/.env
+	if ! command_exists svn; then
+		install_service svn subversion
 	fi
+
+	svn export --force https://github.com/ONLYOFFICE/${PRODUCT}/branches/${GIT_BRANCH}/build/install/docker/ ${BASE_DIR}
+	svn export --force https://github.com/ONLYOFFICE/CommunityServer/branches/master/build/sql/ ${BASE_DIR}/config/ #Download SQL scripts
+
+	reconfigure STATUS ${STATUS}
 }
 
 reconfigure () {
-	VARIABLE_NAME=$1
-	VARIABLE_VALUE=$(echo $2 | sed -e 's/;/%/g' -e 's/=/%/g' -e 's/!/%/g')
+	local VARIABLE_NAME=$1
+	local VARIABLE_VALUE=$2
 
 	if [[ -n ${VARIABLE_VALUE} ]]; then
-		sed -i "s/${VARIABLE_NAME}=.*/${VARIABLE_NAME}=${VARIABLE_VALUE}/g" $BASE_DIR/.env
+		sed -i "s~${VARIABLE_NAME}=.*~${VARIABLE_NAME}=${VARIABLE_VALUE}~g" $BASE_DIR/.env
 	fi
 }
 
@@ -818,8 +810,8 @@ install_mysql_server () {
 	fi
 
 	if [[ -z ${MYSQL_PASSWORD} ]] && [[ -z ${MYSQL_ROOT_PASSWORD} ]]; then
-		MYSQL_PASSWORD=$(get_random_str 20);
-		MYSQL_ROOT_PASSWORD=$(get_random_str 20);
+		MYSQL_PASSWORD=$(get_random_str 20 | sed -e 's/;/%/g' -e 's/=/%/g' -e 's/!/%/g');
+		MYSQL_ROOT_PASSWORD=$(get_random_str 20 | sed -e 's/;/%/g' -e 's/=/%/g' -e 's/!/%/g');
 	elif [[ -z ${MYSQL_PASSWORD} ]] || [[ -z ${MYSQL_ROOT_PASSWORD} ]]; then
 		MYSQL_PASSWORD=${MYSQL_PASSWORD:-"$MYSQL_ROOT_PASSWORD"}
 		MYSQL_ROOT_PASSWORD=${MYSQL_ROOT_PASSWORD:-"$MYSQL_PASSWORD"}
@@ -839,6 +831,7 @@ install_document_server () {
 		install_docker_compose
 	fi
 
+	reconfigure DOCUMENT_SERVER_IMAGE_NAME ${DOCUMENT_SERVER_IMAGE_NAME}
 	reconfigure DOCUMENT_SERVER_JWT_SECRET ${DOCUMENT_SERVER_JWT_SECRET}
 	reconfigure DOCUMENT_SERVER_HOST ${DOCUMENT_SERVER_HOST}
 
@@ -868,6 +861,89 @@ install_appserver () {
 	fi
 
 	docker-compose -f $BASE_DIR/appserver.yml up -d
+	docker-compose -f $BASE_DIR/notify.yml up -d
+}
+
+get_local_image_RepoDigests() {
+   local CONTAINER_IMAGE=$1;
+   LOCAL_IMAGE_RepoDigest=$(docker inspect --format='{{index .RepoDigests 0}}' $CONTAINER_IMAGE)
+   if [ -z ${LOCAL_IMAGE_RepoDigest} ]; then
+        echo "Local docker image not found, check the name of docker image $CONTAINER_IMAGE"
+        exit 1 
+   fi
+   echo $LOCAL_IMAGE_RepoDigest
+}
+
+check_pull_image() {
+    local CONTAINER_IMAGE=$1;
+    CHECK_STATUS_IMAGE="$(docker pull  $CONTAINER_IMAGE | grep Status | awk '{print $2" "$3" "$4" "$5" "$6}')"
+    if [ "${CHECK_STATUS_IMAGE}" == "Image is up to date" ]; then
+        echo "No updates required"
+    fi
+}
+
+check_image_RepoDigest() {
+    local OLD_LOCAL_IMAGE_RepoDigest=$1
+    local NEW_LOCAL_IMAGE_RepoDigest=$2
+    if [ "${OLD_LOCAL_IMAGE_RepoDigest}" == "${NEW_LOCAL_IMAGE_RepoDigest}" ]; then
+       CHECK_RepoDigest="false";
+    else
+       CHECK_RepoDigest="true";
+    fi
+}
+
+docker_image_update() {
+    docker-compose -f $BASE_DIR/notify.yml -f $BASE_DIR/appserver.yml down --volumes
+    docker-compose -f $BASE_DIR/build.yml pull
+}
+
+update_appserver () {
+	if ! command_exists docker-compose; then
+		install_docker_compose
+	fi
+
+	IMAGE_NAME="onlyoffice-api"
+	CONTAINER_IMAGE=$(docker inspect --format='{{.Config.Image}}' $IMAGE_NAME)
+
+	OLD_LOCAL_IMAGE_RepoDigest=$(get_local_image_RepoDigests "${CONTAINER_IMAGE}")
+	check_pull_image "${CONTAINER_IMAGE}"
+	NEW_LOCAL_IMAGE_RepoDigest=$(get_local_image_RepoDigests "${CONTAINER_IMAGE}")
+	check_image_RepoDigest ${OLD_LOCAL_IMAGE_RepoDigest} ${NEW_LOCAL_IMAGE_RepoDigest}
+
+	if [ ${CHECK_RepoDigest} == "true" ]; then
+		docker_image_update
+	fi
+}
+
+save_parameter() {
+	local VARIABLE_NAME=$1
+	local VARIABLE_VALUE=$2
+
+	if [[ -z ${VARIABLE_VALUE} ]]; then
+		sed -n "/.*${VARIABLE_NAME}=/s///p" $BASE_DIR/.env
+	else
+		echo $VARIABLE_VALUE
+	fi
+}
+
+save_parameters_from_configs() {
+	MYSQL_DATABASE=$(save_parameter MYSQL_DATABASE $MYSQL_DATABASE)
+	MYSQL_USER=$(save_parameter MYSQL_USER $MYSQL_USER)
+	MYSQL_PASSWORD=$(save_parameter MYSQL_PASSWORD $MYSQL_PASSWORD)
+	MYSQL_ROOT_PASSWORD=$(save_parameter MYSQL_ROOT_PASSWORD $MYSQL_ROOT_PASSWORD)
+	MYSQL_HOST=$(save_parameter MYSQL_HOST $MYSQL_HOST)
+	DOCUMENT_SERVER_JWT_SECRET=$(save_parameter DOCUMENT_SERVER_JWT_SECRET $DOCUMENT_SERVER_JWT_SECRET)
+	DOCUMENT_SERVER_HOST=$(save_parameter DOCUMENT_SERVER_HOST $DOCUMENT_SERVER_HOST)
+	ZOO_PORT=$(save_parameter ZOO_PORT $ZOO_PORT)
+	ZOO_HOST=$(save_parameter ZOO_HOST $ZOO_HOST)
+	KAFKA_HOST=$(save_parameter KAFKA_HOST $KAFKA_HOST)
+	ELK_HOST=$(save_parameter ELK_HOST $ELK_HOST)
+	SERVICE_PORT=$(save_parameter SERVICE_PORT $SERVICE_PORT)
+	APP_CORE_MACHINEKEY=$(save_parameter APP_CORE_MACHINEKEY $APP_CORE_MACHINEKEY)
+	APP_CORE_BASE_DOMAIN=$(save_parameter APP_CORE_BASE_DOMAIN $APP_CORE_BASE_DOMAIN)
+	if [ ${EXTERNAL_PORT} = "8092" ]; then 
+		EXTERNAL_PORT=$(grep -oP '(?<=- ).*?(?=:8092)' /app/onlyoffice/appserver.yml)
+	fi
 }
 
 start_installation () {
@@ -894,6 +970,10 @@ start_installation () {
 
 	docker_login
 
+	if [ "$UPDATE" = "true" ]; then
+		save_parameters_from_configs
+	fi
+
 	download_files
 
 	set_jwt_secret
@@ -902,6 +982,10 @@ start_installation () {
 
 	create_network
 
+	if [ "$UPDATE" = "true" ]; then
+		update_appserver
+	fi
+
 	if [ "$INSTALL_MYSQL_SERVER" == "true" ]; then
 		install_mysql_server
 	fi

diff --git a/build/install/OneClickInstall/install-RedHat/install-preq.sh b/build/install/OneClickInstall/install-RedHat/install-preq.sh
@@ -74,9 +74,9 @@ rpm -Uvh https://packages.microsoft.com/config/centos/$REV/packages-microsoft-pr
 case $REV in
 	8) 	dnf remove -y @mysql
 		dnf module -y reset mysql && dnf module -y disable mysql
-		${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el8-1.noarch.rpm || true ;;
-	7) 	${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el7-3.noarch.rpm || true ;;
-	6) 	${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el6-3.noarch.rpm || true ;;
+		${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el8-3.noarch.rpm || true ;;
+	7) 	${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el7-5.noarch.rpm || true ;;
+	6) 	${package_manager} localinstall -y https://dev.mysql.com/get/mysql80-community-release-el6-5.noarch.rpm || true ;;
 esac
 
 if ! rpm -q mysql-community-server; then
@@ -100,12 +100,14 @@ END
 
 #install kafka
 PRODUCT_DIR="/var/www/${product}"
-if [ "$(ls -A "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
+if [ "$(ls "$PRODUCT_DIR/services/kafka" 2> /dev/null)" == "" ]; then
 	mkdir -p ${PRODUCT_DIR}/services/
 	getent passwd kafka >/dev/null || useradd -m -d ${PRODUCT_DIR}/services/kafka -s /sbin/nologin -p kafka kafka
 	cd ${PRODUCT_DIR}/services/kafka
-	curl https://downloads.apache.org/kafka/2.7.2/kafka_2.13-2.7.2.tgz -O
-	tar xzf kafka_*.tgz --strip 1 && rm -rf kafka_*.tgz
+	KAFKA_VERSION=$(curl https://downloads.apache.org/kafka/ | grep -Eo '3.1.[0-9]' | tail -1)
+	KAFKA_ARCHIVE=$(curl https://downloads.apache.org/kafka/$KAFKA_VERSION/ | grep -Eo "kafka_2.[0-9][0-9]-$KAFKA_VERSION.tgz" | tail -1)
+	curl https://downloads.apache.org/kafka/$KAFKA_VERSION/$KAFKA_ARCHIVE -O
+	tar xzf $KAFKA_ARCHIVE --strip 1 && rm -rf $KAFKA_ARCHIVE
 	chown -R kafka ${PRODUCT_DIR}/services/kafka
 	cd -
 fi

diff --git a/build/install/docker/.env b/build/install/docker/.env
@@ -6,6 +6,7 @@
     ELK_VERSION=7.13.1
     SERVICE_PORT=5050
     CONTAINER_PREFIX=${PRODUCT}-
+    DOCUMENT_SERVER_IMAGE_NAME=onlyoffice/4testing-documentserver-ee:latest
     DOCKER_TAG=latest
     DOCKERFILE=Dockerfile.app
 

diff --git a/build/install/docker/Dockerfile.app b/build/install/docker/Dockerfile.app
@@ -85,9 +85,9 @@ RUN mkdir -p /var/log/onlyoffice && \
 RUN echo "nameserver 8.8.8.8" | tee /etc/resolv.conf > /dev/null && \
     apt-get -y update && \
     apt-get -y upgrade && \
-    apt-get install -yq nano && \
-    apt-get install -yq jq && \
-    apt-get install -yq nodejs && \
+    apt-get install -yq sudo nano curl vim && \
+    curl -fsSL https://deb.nodesource.com/setup_14.x | sudo -E bash - && \
+    apt-get install -y nodejs && \
     apt-get install -yq libgdiplus
 
 #USER onlyoffice
@@ -136,6 +136,7 @@ RUN chown nginx:nginx /etc/nginx/* -R && \
     sed -i 's/localhost:5000/$service_api/' /etc/nginx/conf.d/onlyoffice.conf && \
     sed -i 's/localhost:5003/$service_studio/' /etc/nginx/conf.d/onlyoffice.conf && \
     sed -i 's/localhost:5023/$service_calendar/' /etc/nginx/conf.d/onlyoffice.conf && \
+    sed -i 's/localhost:9899/$service_socket/' /etc/nginx/conf.d/onlyoffice.conf && \
     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/172.*/$document_server;/' /etc/nginx/conf.d/onlyoffice.conf

diff --git a/build/install/docker/ds.yml b/build/install/docker/ds.yml
@@ -1,7 +1,7 @@
 version: '3.6'
 services:
   onlyoffice-document-server:
-    image: "${REPO}/${STATUS}documentserver:latest"
+    image: "${DOCUMENT_SERVER_IMAGE_NAME}"
     container_name: ${DOCUMENT_SERVER_HOST}
     # Strings below enable the JSON Web Token validation.
     environment: