Upgrade elasticsearch to version 7.16.3 (#159)

* Upgrade elasticsearch to version 7.16.3

* Remove unnecessary log4j vulnerability fix

Dockerfile

@@ -7,11 +7,6 @@ ARG SOURCE_REPO_URL="deb http://static.teamlab.com.s3.amazonaws.com/repo/debian
 ARG DEBIAN_FRONTEND=noninteractive
 ARG PACKAGE_SYSNAME="onlyoffice"
 
-ARG LOG4J_VER=2.17.2
-ARG LOG4J_BIN=apache-log4j-${LOG4J_VER}-bin
-ARG LOG4J_ARCH=${LOG4J_BIN}.tar.gz
-ARG LOG4J_DIR=./log4j
-
 ARG ELK_DIR=/usr/share/elasticsearch
 ARG ELK_LIB_DIR=${ELK_DIR}/lib
 ARG ELK_MODULE_DIR=${ELK_DIR}/modules
@@ -25,7 +20,7 @@ LABEL ${PACKAGE_SYSNAME}.community.release-date="${RELEASE_DATE}" \
 ENV LANG=en_US.UTF-8 \
     LANGUAGE=en_US:en \
     LC_ALL=en_US.UTF-8 \
-    ELASTICSEARCH_VERSION=7.10.0
+    ELASTICSEARCH_VERSION=7.16.3
 
 RUN apt-get -y update && \
     apt-get -y upgrade && \
@@ -96,17 +91,6 @@ RUN apt-get -y update && \
                         dotnet-sdk-6.0 \
                         ${PACKAGE_SYSNAME}-communityserver \
                         ${PACKAGE_SYSNAME}-xmppserver && \
-    rm -v ${ELK_LIB_DIR}/log4j-*.jar ${ELK_MODULE_DIR}/*/log4j-*.jar && \
-    wget https://dlcdn.apache.org/logging/log4j/${LOG4J_VER}/${LOG4J_ARCH}&& \
-    mkdir ${LOG4J_DIR} && \
-    tar -xf ${LOG4J_ARCH} -C ${LOG4J_DIR} && \
-    cp -v ${LOG4J_DIR}/${LOG4J_BIN}/log4j-api-${LOG4J_VER}.jar ${ELK_LIB_DIR} && \
-    cp -v ${LOG4J_DIR}/${LOG4J_BIN}/log4j-core-${LOG4J_VER}.jar ${ELK_LIB_DIR} && \
-    cp -v ${LOG4J_DIR}/${LOG4J_BIN}/log4j-1.2-api-${LOG4J_VER}.jar ${ELK_MODULE_DIR}/x-pack-core && \
-    cp -v ${LOG4J_DIR}/${LOG4J_BIN}/log4j-slf4j-impl-${LOG4J_VER}.jar ${ELK_MODULE_DIR}/x-pack-identity-provider && \
-    cp -v ${LOG4J_DIR}/${LOG4J_BIN}/log4j-slf4j-impl-${LOG4J_VER}.jar ${ELK_MODULE_DIR}/x-pack-security && \
-    rm -vr ${LOG4J_ARCH} ${LOG4J_DIR} && \
-    zip -q -d ${ELK_LIB_DIR}/log4j-core-*.jar org/apache/logging/log4j/core/lookup/JndiLookup.class && \
     apt-get clean && \
     rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
 

docker-compose.groups.yml

@@ -48,7 +48,7 @@ services:
      - /sys/fs/cgroup:/sys/fs/cgroup:ro
      - ./certs:/var/www/onlyoffice/Data/certs
   onlyoffice-elasticsearch:
-    image: onlyoffice/elasticsearch:7.10.0
+    image: onlyoffice/elasticsearch:7.16.3
     container_name: onlyoffice-elasticsearch
     restart: always
     environment:

docker-compose.workspace.yml

@@ -62,7 +62,7 @@ services:
      - /sys/fs/cgroup:/sys/fs/cgroup:ro
      - ./certs:/var/www/onlyoffice/Data/certs
   onlyoffice-elasticsearch:
-    image: onlyoffice/elasticsearch:7.10.0
+    image: onlyoffice/elasticsearch:7.16.3
     container_name: onlyoffice-elasticsearch
     restart: always
     environment:

docker-compose.workspace_enterprise.yml

@@ -62,7 +62,7 @@ services:
      - /sys/fs/cgroup:/sys/fs/cgroup:ro
      - ./certs:/var/www/onlyoffice/Data/certs
   onlyoffice-elasticsearch:
-    image: onlyoffice/elasticsearch:7.10.0
+    image: onlyoffice/elasticsearch:7.16.3
     container_name: onlyoffice-elasticsearch
     restart: always
     environment: