Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: 更新 docker 26.0.0 #401

Merged
merged 1 commit into from
Apr 7, 2024
Merged

feat: 更新 docker 26.0.0 #401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions compose/docker-compose-celery-xpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
celery:
image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
2 changes: 0 additions & 2 deletions compose/docker-compose-celery.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
celery:
image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-chen.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
chen:
image: ${REGISTRY:-docker.io}/jumpserver/chen:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-core-xpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
core:
image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
2 changes: 0 additions & 2 deletions compose/docker-compose-core.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
core:
image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-es.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
es:
image: docker.elastic.co/elasticsearch/elasticsearch:7.17.16
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-init-db-xpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
core:
image: ${REGISTRY:-docker.io}/jumpserver/core-ee:${VERSION}
2 changes: 0 additions & 2 deletions compose/docker-compose-init-db.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
core:
image: ${REGISTRY:-docker.io}/jumpserver/core-ce:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-kael.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
kael:
image: ${REGISTRY:-docker.io}/jumpserver/kael:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-koko.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
koko:
image: ${REGISTRY:-docker.io}/jumpserver/koko:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-lb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
web:
ports:
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-lion.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
lion:
image: ${REGISTRY:-docker.io}/jumpserver/lion:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-magnus-xpack.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
magnus:
ports:
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-magnus.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
magnus:
image: ${REGISTRY:-docker.io}/jumpserver/magnus:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-mariadb.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
mysql:
image: jumpserver/mariadb:10.6
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-minio.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
minio:
image: jumpserver/minio:latest
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-mysql.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
mysql:
image: jumpserver/mysql:5.7
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-network.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

networks:
net:
driver: bridge
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-network_v6.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

networks:
net:
driver: bridge
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-panda.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
panda:
image: ${REGISTRY:-docker.io}/jumpserver/panda:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-razor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
razor:
image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/razor:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-redis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
redis:
image: jumpserver/redis:6.2
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-video-worker.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
video:
image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-video.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
video:
image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/video-worker:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-web.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
web:
image: ${REGISTRY:-docker.io}/jumpserver/web:${VERSION}
Expand Down
2 changes: 0 additions & 2 deletions compose/docker-compose-xrdp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
version: '2.4'

services:
xrdp:
image: ${REGISTRY:-registry.fit2cloud.com}/jumpserver/xrdp:${VERSION}
Expand Down
20 changes: 10 additions & 10 deletions scripts/const.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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