Merge pull request #401 from jumpserver/pr@dev@upgrade_docker_version

feat: 更新 docker 26.0.0
jumpserver · Apr 7, 2024 · 7e0079c · 7e0079c
2 parents ceaeef4 + ba66aea
commit 7e0079c
Show file tree

Hide file tree

Showing 27 changed files with 10 additions and 62 deletions.
diff --git a/compose/docker-compose-celery-xpack.yml b/compose/docker-compose-celery-xpack.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   celery:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
diff --git a/compose/docker-compose-celery.yml b/compose/docker-compose-celery.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   celery:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

diff --git a/compose/docker-compose-chen.yml b/compose/docker-compose-chen.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   chen:
     image: ${REGISTRY:-docker.io}/jumpserver/chen:${VERSION}

diff --git a/compose/docker-compose-core-xpack.yml b/compose/docker-compose-core-xpack.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
diff --git a/compose/docker-compose-core.yml b/compose/docker-compose-core.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

diff --git a/compose/docker-compose-es.yml b/compose/docker-compose-es.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   es:
     image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16

diff --git a/compose/docker-compose-init-db-xpack.yml b/compose/docker-compose-init-db-xpack.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
diff --git a/compose/docker-compose-init-db.yml b/compose/docker-compose-init-db.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   core:
     image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}

diff --git a/compose/docker-compose-kael.yml b/compose/docker-compose-kael.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   kael:
     image: ${REGISTRY:-docker.io}/jumpserver/kael:${VERSION}

diff --git a/compose/docker-compose-koko.yml b/compose/docker-compose-koko.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   koko:
     image: ${REGISTRY:-docker.io}/jumpserver/koko:${VERSION}

diff --git a/compose/docker-compose-lb.yml b/compose/docker-compose-lb.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   web:
     ports:

diff --git a/compose/docker-compose-lion.yml b/compose/docker-compose-lion.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   lion:
     image: ${REGISTRY:-docker.io}/jumpserver/lion:${VERSION}

diff --git a/compose/docker-compose-magnus-xpack.yml b/compose/docker-compose-magnus-xpack.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   magnus:
     ports:

diff --git a/compose/docker-compose-magnus.yml b/compose/docker-compose-magnus.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   magnus:
     image: ${REGISTRY:-docker.io}/jumpserver/magnus:${VERSION}

diff --git a/compose/docker-compose-mariadb.yml b/compose/docker-compose-mariadb.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mysql:
     image: jumpserver/mariadb:10.6

diff --git a/compose/docker-compose-minio.yml b/compose/docker-compose-minio.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   minio:
     image: jumpserver/minio:latest

diff --git a/compose/docker-compose-mysql.yml b/compose/docker-compose-mysql.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   mysql:
     image: jumpserver/mysql:5.7

diff --git a/compose/docker-compose-network.yml b/compose/docker-compose-network.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   net:
     driver: bridge

diff --git a/compose/docker-compose-network_v6.yml b/compose/docker-compose-network_v6.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 networks:
   net:
     driver: bridge

diff --git a/compose/docker-compose-panda.yml b/compose/docker-compose-panda.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   panda:
     image: ${REGISTRY:-docker.io}/jumpserver/panda:${VERSION}

diff --git a/compose/docker-compose-razor.yml b/compose/docker-compose-razor.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   razor:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/razor:${VERSION}

diff --git a/compose/docker-compose-redis.yml b/compose/docker-compose-redis.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   redis:
     image: jumpserver/redis:6.2

diff --git a/compose/docker-compose-video-worker.yml b/compose/docker-compose-video-worker.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   video:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}

diff --git a/compose/docker-compose-video.yml b/compose/docker-compose-video.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   video:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}

diff --git a/compose/docker-compose-web.yml b/compose/docker-compose-web.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   web:
     image: ${REGISTRY:-docker.io}/jumpserver/web:${VERSION}

diff --git a/compose/docker-compose-xrdp.yml b/compose/docker-compose-xrdp.yml
@@ -1,5 +1,3 @@
-version: '2.4'
-
 services:
   xrdp:
     image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/xrdp:${VERSION}

diff --git a/scripts/const.sh b/scripts/const.sh
@@ -26,36 +26,36 @@ STATIC_ENV=${PROJECT_DIR}/static.env
 . "${STATIC_ENV}"
 
 export OS=$(uname -s)
-export DOCKER_VERSION=25.0.4
+export DOCKER_VERSION=26.0.0
 export DOCKER_MIRROR="https://download.jumpserver.org/docker/docker-ce/linux/static/stable"
 export DOCKER_BIN_URL="${DOCKER_MIRROR}/$(uname -m)/docker-${DOCKER_VERSION}.tgz"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_MD5=417e91fcf5774d0f04c58d5500b1946f
+  DOCKER_MD5=908fb24b8e3712199b30d4b381af9bba
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_MD5=9095035fc0700aacfc7262cf353e91e8
+  DOCKER_MD5=b4868578258823e4b6ba1b83048dc5c1
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_MD5=ec3634e6fec48aedbc903a9f47f7f6b0
+  DOCKER_MD5=fb04660cdb594e2628361a0591078958
 fi
 if [[ "$(uname -m)" == "s390x" ]]; then
-  DOCKER_MD5=794804888e312a8d912eac1b9a4ac3e4
+  DOCKER_MD5=f417e4e6480c630ad3e527706610aa82
 fi
 export DOCKER_MD5
 
-export DOCKER_COMPOSE_VERSION=v2.24.7
+export DOCKER_COMPOSE_VERSION=v2.26.1
 export DOCKER_COMPOSE_MIRROR="https://download.jumpserver.org/docker/compose/releases/download"
 export DOCKER_COMPOSE_BIN_URL="${DOCKER_COMPOSE_MIRROR}/${DOCKER_COMPOSE_VERSION}/docker-compose-linux-$(uname -m)"
 if [[ "$(uname -m)" == "x86_64" ]]; then
-  DOCKER_COMPOSE_MD5=a24c26e39af438437c8d664f109f8456
+  DOCKER_COMPOSE_MD5=d0e38e2a1ec580a77feea34f466df81c
 fi
 if [[ "$(uname -m)" == "aarch64" ]]; then
-  DOCKER_COMPOSE_MD5=d094e1551cb3c4de858aaff562bcd4d8
+  DOCKER_COMPOSE_MD5=13e42b2e23dc23c9ac3a37932aa0e28a
 fi
 if [[ "$(uname -m)" == "loongarch64" ]]; then
-  DOCKER_COMPOSE_MD5=987b6b6964431b86979e9fe6a00f98b5
+  DOCKER_COMPOSE_MD5=e38fad868cbcc2b3e2ef33d14ab28fe9
 fi
 if [[ "$(uname -m)" == "s390x" ]]; then
-  DOCKER_COMPOSE_MD5=4b182bfbfb2ba190000b9ec2593898f1
+  DOCKER_COMPOSE_MD5=665143c87c8486d51df44da22313ad73
 fi
 export DOCKER_COMPOSE_MD5