Merge pull request #1 from wojiushixiaobai/dev

feat: 更新 v3.10.1
wojiushixiaobai · Jan 16, 2024 · d5bc19a · d5bc19a
2 parents d44b3e0 + 3a5fd93
commit d5bc19a
Show file tree

Hide file tree

Showing 6 changed files with 63 additions and 126 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,45 @@
+name: Build
+
+on:
+  push:
+    # Sequence of patterns matched against refs/tags
+    tags:
+      - '*' # Push events to matching v*, i.e. v1.0, v20.15.10
+
+jobs:
+    build:
+        runs-on: ubuntu-latest
+        strategy:
+            matrix:
+                component: [core, koko, lion, kael, chen, magnus, web]
+        steps:
+            - uses: actions/checkout@v4
+            - uses: docker/setup-qemu-action@v3
+            - uses: docker/setup-buildx-action@v3
+            - name: Get Version
+              run: |
+                echo "version=$(basename ${GITHUB_REF})" >> $GITHUB_ENV
+
+            - name: Login to Docker Hub
+              uses: docker/login-action@v3
+              with:
+                  username: wojiushixiaobai
+                  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
+                    push: true
+                    tags: |
+                      wojiushixiaobai/jms_${{ matrix.component }}:${{ env.version }}
+                      ghcr.io/wojiushixiaobai/jms_${{ matrix.component }}:${{ env.version }}
diff --git a/docker-compose-build.yml b/docker-compose-build.yml
@@ -7,7 +7,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/core-ce:${VERSION}
+    image: wojiushixiaobai/jms_core:${VERSION}
     container_name: jms_core
     restart: always
     command: start web
@@ -40,7 +40,7 @@ services:
       - net
 
   celery:
-    image: jumpserver/core-ce:${VERSION}
+    image: wojiushixiaobai/jms_core:${VERSION}
     container_name: jms_celery
     restart: always
     command: start task
@@ -81,7 +81,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/koko:${VERSION}
+    image: wojiushixiaobai/jms_koko:${VERSION}
     container_name: jms_koko
     restart: always
     privileged: true
@@ -113,7 +113,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/lion:${VERSION}
+    image: wojiushixiaobai/jms_lion:${VERSION}
     container_name: jms_lion
     restart: always
     environment:
@@ -141,7 +141,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/magnus:${VERSION}
+    image: wojiushixiaobai/jms_magnus:${VERSION}
     container_name: jms_magnus
     restart: always
     environment:
@@ -176,7 +176,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/chen:${VERSION}
+    image: wojiushixiaobai/jms_chen:${VERSION}
     container_name: jms_chen
     ulimits:
       core: 0
@@ -206,7 +206,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/kael:${VERSION}
+    image: wojiushixiaobai/jms_kael:${VERSION}
     container_name: jms_kael
     ulimits:
       core: 0
@@ -236,7 +236,7 @@ services:
       args:
         VERSION: ${VERSION}
         TARGETARCH: ${TARGETARCH}
-    image: jumpserver/web:${VERSION}
+    image: wojiushixiaobai/jms_web:${VERSION}
     container_name: jms_web
     restart: always
     environment:

diff --git a/docker-compose-init-db.yml b/docker-compose-init-db.yml
@@ -2,7 +2,7 @@ version: '2.4'
 
 services:
   core:
-    image: jumpserver/core-ce:${VERSION}
+    image: wojiushixiaobai/jms_core:${VERSION}
     container_name: jms_core
     command: sleep
     environment:

diff --git a/docker-compose-xpack.yml b/docker-compose-xpack.yml
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -1,7 +1,7 @@
 version: '2.4'
 services:
   core:
-    image: jumpserver/core-ce:${VERSION}
+    image: wojiushixiaobai/jms_core:${VERSION}
     container_name: jms_core
     ulimits:
       core: 0
@@ -34,7 +34,7 @@ services:
       - net
 
   celery:
-    image: jumpserver/core-ce:${VERSION}
+    image: wojiushixiaobai/jms_core:${VERSION}
     container_name: jms_celery
     ulimits:
       core: 0
@@ -70,7 +70,7 @@ services:
       - net
 
   koko:
-    image: jumpserver/koko:${VERSION}
+    image: wojiushixiaobai/jms_koko:${VERSION}
     container_name: jms_koko
     ulimits:
       core: 0
@@ -98,7 +98,7 @@ services:
       - net
 
   lion:
-    image: jumpserver/lion:${VERSION}
+    image: wojiushixiaobai/jms_lion:${VERSION}
     container_name: jms_lion
     ulimits:
       core: 0
@@ -122,7 +122,7 @@ services:
       - net
 
   magnus:
-    image: jumpserver/magnus:${VERSION}
+    image: wojiushixiaobai/jms_magnus:${VERSION}
     container_name: jms_magnus
     ulimits:
       core: 0
@@ -153,7 +153,7 @@ services:
       - net
 
   chen:
-    image: jumpserver/chen:${VERSION}
+    image: wojiushixiaobai/jms_chen:${VERSION}
     container_name: jms_chen
     ulimits:
       core: 0
@@ -177,7 +177,7 @@ services:
       - net
 
   kael:
-    image: jumpserver/kael:${VERSION}
+    image: wojiushixiaobai/jms_kael:${VERSION}
     container_name: jms_kael
     ulimits:
       core: 0
@@ -201,7 +201,7 @@ services:
       - net
 
   web:
-    image: jumpserver/web:${VERSION}
+    image: wojiushixiaobai/jms_web:${VERSION}
     container_name: jms_web
     restart: always
     depends_on:

diff --git a/magnus/Dockerfile b/magnus/Dockerfile
@@ -48,7 +48,7 @@ RUN set -ex \
 COPY magnus/entrypoint.sh .
 RUN chmod 755 ./entrypoint.sh
 
-FROM debian:buster-slim
+FROM debian:bullseye-slim
 ENV LANG=en_US.UTF-8
 
 ARG DEPENDENCIES="                    \