feat: 更新 v3.10.4

wojiushixiaobai · Mar 25, 2024 · 56c9802 · 56c9802
1 parent 1bcfddb
commit 56c9802
Show file tree

Hide file tree

Showing 14 changed files with 98 additions and 90 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -11,7 +11,62 @@ jobs:
     runs-on: ubuntu-latest
     strategy:
       matrix:
-        component: [core, koko, lion, kael, chen, magnus, web]
+        component: [koko, lion, kael, chen, magnus, web]
+    steps:
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@main
+        with:
+          tool-cache: true
+          android: true
+          dotnet: true
+          haskell: true
+          large-packages: true
+          docker-images: true
+          swap-storage: true
+
+      - uses: actions/checkout@v4
+      - uses: docker/setup-qemu-action@v3
+      - uses: docker/setup-buildx-action@v3
+      - uses: actions/setup-python@v4
+
+      - name: Get Version
+        run: |
+          echo "version=$(basename ${GITHUB_REF})" >> $GITHUB_ENV
+
+      - name: Login to Docker Hub
+        uses: docker/login-action@v3
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKER_HUB_TOKEN }}
+
+      - name: Login to GitHub Container Registry
+        uses: docker/login-action@v3
+        with:
+          registry: ghcr.io
+          username: ${{ github.repository_owner }}
+          password: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Build and Push Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.component }}/Dockerfile
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          push: true
+          tags: |
+            ${{ github.repository_owner }}/jms_${{ matrix.component }}:${{ env.version }}
+            ${{ github.repository_owner }}/jms_${{ matrix.component }}:latest
+            ghcr.io/${{ github.repository_owner }}/jms_${{ matrix.component }}:${{ env.version }}
+            ghcr.io/${{ github.repository_owner }}/jms_${{ matrix.component }}:latest
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
+  core:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        component: [core]
     steps:
       - name: Free Disk Space (Ubuntu)
         uses: jlumbroso/free-disk-space@main
@@ -43,6 +98,8 @@ jobs:
         if: matrix.component == 'core'
         run: |
           wget https://github.com/jumpserver/jumpserver/raw/${{ env.version }}/pyproject.toml
+          cryptography_version=$(awk -F'"' '/cryptography/{print $2}' pyproject.toml)
+          echo "cryptography_version=${cryptography_version}" >> $GITHUB_ENV
           sed -i 's@^cython =@# cython =@g' pyproject.toml
           sed -i 's@^certifi =@# certifi =@g' pyproject.toml
           sed -i 's@^cffi =@# cffi =@g' pyproject.toml
@@ -67,6 +124,22 @@ jobs:
           username: ${{ github.repository_owner }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
+      - name: Build and Push Cache Image
+        uses: docker/build-push-action@v5
+        with:
+          context: .
+          file: ${{ matrix.component }}/Dockerfile.base
+          platforms: linux/amd64,linux/arm64,linux/ppc64le,linux/s390x
+          push: true
+          build-args:
+            CRYPTOGRAPHY_VERSION=${{ env.cryptography_version }}
+          tags: |
+            ${{ github.repository_owner }}/${{ matrix.component }}:base-bookworm
+            ghcr.io/${{ github.repository_owner }}/${{ matrix.component }}:base-bookworm
+          outputs: type=image,oci-mediatypes=true,compression=zstd,compression-level=3,force-compression=true
+          cache-from: type=gha
+          cache-to: type=gha,mode=max
+
       - name: Build and Push Image
         uses: docker/build-push-action@v5
         with:
@@ -84,7 +157,7 @@ jobs:
           cache-to: type=gha,mode=max
 
   allinone:
-    needs: build
+    needs: core
     runs-on: ubuntu-latest
     strategy:
       matrix:

diff --git a/.github/workflows/cache.yml b/.github/workflows/cache.yml
diff --git a/README.md b/README.md
@@ -56,7 +56,7 @@ vi .env
 ```
 ```vim
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.3
+VERSION=v3.10.4
 
 # 构建参数, 支持 amd64/arm64/ppc64le/s390x...
 TARGETARCH=amd64

diff --git a/allinone/Dockerfile b/allinone/Dockerfile
@@ -1,7 +1,7 @@
 FROM redis:7.0-bookworm as redis
 FROM jumpserver/guacd:1.5.3-bookworm as guacd
-FROM jumpserver/web-static:v1.0.6-bookworm as static
-FROM wojiushixiaobai/jms_core:v3.10.3
+FROM jumpserver/web-static:v1.0.7-bookworm as static
+FROM wojiushixiaobai/jms_core:v3.10.4
 ARG TARGETARCH
 
 ARG TOOLS="                           \

diff --git a/allinone/README.md b/allinone/README.md
@@ -103,7 +103,7 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  wojiushixiaobai/jms_all:v3.10.3
+  wojiushixiaobai/jms_all:v3.10.4
 ```
 
 **升级**
@@ -119,7 +119,7 @@ mysqldump -h$DB_HOST -p$DB_PORT -u$DB_USER -p$DB_PASSWORD $DB_NAME > /opt/jumpse
 # 例: mysqldump -h192.168.100.11 -p3306 -ujumpserver -pnu4x599Wq7u0Bn8EABh3J91G jumpserver > /opt/jumpserver-v2.12.0.sql
 
 # 拉取新版本镜像
-docker pull wojiushixiaobai/jms_all:v3.10.3
+docker pull wojiushixiaobai/jms_all:v3.10.4
 
 # 删掉旧版本容器
 docker rm jms_all
@@ -147,4 +147,4 @@ docker run --name jms_all -d \
   -v /opt/jumpserver/kael/data:/opt/kael/data \
   -v /opt/jumpserver/chen/data:/opt/chen/data \
   -v /opt/jumpserver/web/log:/var/log/nginx \
-  wojiushixiaobai/jms_all:v3.10.3
+  wojiushixiaobai/jms_all:v3.10.4
diff --git a/allinone/readme.txt b/allinone/readme.txt
@@ -11,4 +11,4 @@ The Installation is Complete.
   ╚█████╔╝╚██████╔╝██║ ╚═╝ ██║██║     ███████║███████╗██║  ██║ ╚████╔╝ ███████╗██║  ██║
    ╚════╝  ╚═════╝ ╚═╝     ╚═╝╚═╝     ╚══════╝╚══════╝╚═╝  ╚═╝  ╚═══╝  ╚══════╝╚═╝  ╚═╝
 
-                                                                   VERSION: v3.10.3
+                                                                   VERSION: v3.10.4
diff --git a/chen/Dockerfile b/chen/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -69,7 +69,7 @@ COPY --from=stage-1 /opt/chen /opt/chen
 
 WORKDIR /opt/chen
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/chen/data

diff --git a/config_example.conf b/config_example.conf
@@ -1,5 +1,5 @@
 # 版本号可以自己根据项目的版本修改
-VERSION=v3.10.3
+VERSION=v3.10.4
 
 # 构建参数, 支持 amd64/arm64/ppc64le/s390x
 TARGETARCH=amd64

diff --git a/core/Dockerfile b/core/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=$VERSION
 
 RUN set -ex \
@@ -90,7 +90,7 @@ COPY --from=stage-1 /opt/jumpserver/release/jumpserver /opt/jumpserver
 
 WORKDIR /opt/jumpserver
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/jumpserver/data

diff --git a/kael/Dockerfile b/kael/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -69,7 +69,7 @@ COPY --from=stage-1 /opt/kael /opt/kael
 
 WORKDIR /opt/kael
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/kael/data

diff --git a/koko/Dockerfile b/koko/Dockerfile
@@ -79,7 +79,7 @@ RUN set -ex \
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -122,7 +122,7 @@ COPY --from=stage-2 /opt/kubectl-aliases /opt/kubectl-aliases
 
 WORKDIR /opt/koko
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/koko/data

diff --git a/lion/Dockerfile b/lion/Dockerfile
@@ -25,7 +25,7 @@ RUN set -ex \
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -62,7 +62,7 @@ COPY lion/supervisord.conf /etc/supervisor/conf.d/lion.conf
 
 WORKDIR /opt/lion
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/lion/data

diff --git a/magnus/Dockerfile b/magnus/Dockerfile
@@ -33,7 +33,7 @@ RUN set -ex \
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -68,7 +68,7 @@ COPY --from=stage-1 /opt/magnus /opt/magnus
 
 WORKDIR /opt/magnus
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /opt/magnus/data

diff --git a/web/Dockerfile b/web/Dockerfile
@@ -1,4 +1,4 @@
-FROM jumpserver/web-static:v1.0.6-bookworm as stage-1
+FROM jumpserver/web-static:v1.0.7-bookworm as stage-1
 FROM debian:bookworm-slim as stage-2
 ARG TARGETARCH
 
@@ -24,7 +24,7 @@ RUN set -ex \
     && chmod 755 /usr/local/bin/check \
     && rm -f check-${CHECK_VERSION}-linux-${TARGETARCH}.tar.gz
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 RUN set -ex \
@@ -64,7 +64,7 @@ COPY web/nginx.conf /etc/nginx/
 
 WORKDIR /opt
 
-ARG VERSION=v3.10.3
+ARG VERSION=v3.10.4
 ENV VERSION=${VERSION}
 
 VOLUME /var/log/nginx