Merge pull request #178 from jumpserver/dev

v2.17.0 rc3
jumpserver · Dec 14, 2021 · a21ca71 · a21ca71
2 parents c60697a + 0a9f79d
commit a21ca71
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 15 deletions.
diff --git a/compose/docker-compose-es.yml b/compose/docker-compose-es.yml
@@ -2,7 +2,7 @@ version: '2.4'
 
 services:
   es:
-    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.0
+    image: docker.elastic.co/elasticsearch/elasticsearch:7.16.1
     container_name: jms_es
     restart: always
     ports:
@@ -18,7 +18,7 @@ services:
       bootstrap.memory_lock: "true"
       xpack.security.enabled: "true"
       TAKE_FILE_OWNERSHIP: "true"
-      ES_JAVA_OPTS: "-Xms512m -Xmx512m -Dlog4j2.formatMsgNoLookups=true"
+      ES_JAVA_OPTS: "-Xms512m -Xmx512m"
       ELASTIC_PASSWORD: $BOOTSTRAP_TOKEN
     ulimits:
       memlock:

diff --git a/scripts/const.sh b/scripts/const.sh
@@ -17,14 +17,14 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=20.10.9
+export DOCKER_VERSION=20.10.11
 export DOCKER_MIRROR="https://mirrors.ustc.edu.cn/docker-ce/linux/static/stable"
 DOCKER_BIN_URL="${DOCKER_MIRROR}/$(uname -m)/docker-${DOCKER_VERSION}.tgz"
 export DOCKER_BIN_URL
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  export DOCKER_MD5=d5f96b3f2b6898eec5a530cfcf8f6e27
+  export DOCKER_MD5=1e90552320ee41f3a07827ffd85bde18
 else
-  export DOCKER_MD5=24babcf045085cd88d527025b8296fd5
+  export DOCKER_MD5=5819cbe9b18070c79d721ae66661c997
 fi
 
 export DOCKER_COMPOSE_VERSION=1.29.2

diff --git a/scripts/utils.sh b/scripts/utils.sh
@@ -352,17 +352,7 @@ function prepare_set_redhat_firewalld() {
       docker_subnet=$(get_config DOCKER_SUBNET)
       if ! firewall-cmd --list-rich-rule | grep "${docker_subnet}" >/dev/null; then
         firewall-cmd --permanent --zone=public --add-rich-rule="rule family=ipv4 source address=${docker_subnet} accept" >/dev/null
-        flag=1
-      fi
-      if command -v dnf >/dev/null; then
-        if ! firewall-cmd --list-all | grep 'masquerade: yes' >/dev/null; then
-          firewall-cmd --permanent --add-masquerade >/dev/null
-          flag=1
-        fi
-      fi
-      if [[ "$flag" ]]; then
         firewall-cmd --reload >/dev/null
-        unset flag
       fi
     fi
   fi