perf: update base version

perf: Update Dockerfile with new base image tag perf: update ansible version perf: Update Dockerfile with new base image tag perf: update workflow perf: update workflow perf: update aliyunsdkversion perf: Update Dockerfile with new base image tag perf: Update Dockerfile with new base image tag
2026-05-03 01:37:15 +00:00 · 2026-04-23 09:57:20 +08:00
parent d48eb40472
commit 6cc2fbcf21
4 changed files with 86 additions and 63 deletions
--- a/.github/workflows/build-base-image.yml
+++ b/.github/workflows/build-base-image.yml
@@ -1,73 +1,95 @@
 name: Build and Push Base Image

 on:
-    pull_request:
-        branches:
-            - 'dev'
-            - 'osm'
-            - 'v*'
-        paths:
-            - poetry.lock
-            - pyproject.toml
-            - Dockerfile-base
-            - package.json
-            - go.mod
-            - yarn.lock
-            - pom.xml
-            - install_deps.sh
-            - utils/clean_site_packages.sh
-        types:
-            - opened
-            - synchronize
-            - reopened
+  pull_request:
+    branches:
+        - 'dev'
+        - 'v*'
+    paths:
+        - poetry.lock
+        - pyproject.toml
+        - Dockerfile-base
+        - package.json
+        - go.mod
+        - yarn.lock
+        - pom.xml
+        - install_deps.sh
+        - utils/clean_site_packages.sh
+    types:
+        - opened
+        - synchronize
+        - reopened
+  workflow_dispatch:
+    inputs:
+      branch:
+        description: '构建基础镜像所用的分支'
+        required: true
+        type: string
+        default: 'main'

 jobs:
-    build-and-push:
-        runs-on: ubuntu-22.04
-        steps:
-            - name: Checkout repository
-              uses: actions/checkout@v4
-              with:
-                  ref: ${{ github.event.pull_request.head.ref }}
+  build-and-push:
+    runs-on: ubuntu-latest

-            - name: Set up QEMU
-              uses: docker/setup-qemu-action@v3
+    steps:
+      - name: Lock Pull Request
+        if: github.event_name == 'push'
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"pending", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"

-            - name: Set up Docker Buildx
-              uses: docker/setup-buildx-action@v3
+      - name: Checkout repository
+        uses: actions/checkout@v4
+        with:
+          ref: ${{ github.event_name == 'workflow_dispatch' && inputs.branch || github.ref }}

-            - name: Login to DockerHub
-              uses: docker/login-action@v2
-              with:
-                  username: ${{ secrets.DOCKERHUB_USERNAME }}
-                  password: ${{ secrets.DOCKERHUB_TOKEN }}
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3

-            - name: Extract date
-              id: vars
-              run: echo "IMAGE_TAG=$(date +'%Y%m%d_%H%M%S')" >> $GITHUB_ENV
+      - name: Set up Docker Buildx
+        uses: docker/setup-buildx-action@v3

-            - name: Extract repository name
-              id: repo
-              run: echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV
+      - name: Login to DockerHub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}

-            - name: Build and push multi-arch image
-              uses: docker/build-push-action@v6
-              with:
-                  platforms: linux/amd64,linux/arm64
-                  push: true
-                  file: Dockerfile-base
-                  tags: jumpserver/core-base:${{ env.IMAGE_TAG }}
+      - name: Extract date
+        id: vars
+        run: echo "IMAGE_TAG=$(date +'%Y%m%d_%H%M%S')" >> $GITHUB_ENV

-            - name: Update Dockerfile
-              run: |
-                  sed -i 's|-base:.* AS stage-build|-base:${{ env.IMAGE_TAG }} AS stage-build|' Dockerfile
+      - name: Extract repository name
+        id: repo
+        run: echo "REPO=$(basename ${{ github.repository }})" >> $GITHUB_ENV

-            - name: Commit changes
-              run: |
-                  git config --global user.name 'github-actions[bot]'
-                  git config --global user.email 'github-actions[bot]@users.noreply.github.com'
-                  git add Dockerfile
-                  git commit -m "perf: Update Dockerfile with new base image tag"
-                  git push origin ${{ github.event.pull_request.head.ref }}
-              env:
-                  GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+      - name: Build and push multi-arch image
+        uses: docker/build-push-action@v6
+        with:
+          platforms: linux/amd64,linux/arm64
+          push: true
+          file: Dockerfile-base
+          tags: jumpserver/core-base:${{ env.IMAGE_TAG }}
+          context: .
+
+      - name: Update Dockerfile
+        run: |
+          sed -i 's|-base:.* AS stage-build|-base:${{ env.IMAGE_TAG }} AS stage-build|' Dockerfile
+
+      - name: Commit changes
+        run: |
+          git config --global user.name 'github-actions[bot]'
+          git config --global user.email 'github-actions[bot]@users.noreply.github.com'
+          git add Dockerfile
+          git commit -m "perf: Update Dockerfile with new base image tag"
+          git push
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
+
+      - name: Unlock Pull Request
+        if: github.event_name == 'push'
+        run: |
+          curl -X POST -H "Authorization: token ${{ secrets.GITHUB_TOKEN }}" \
+          -d '{"state":"success", "description":"Action running, merge disabled", "context":"Lock PR"}' \
+          "https://api.github.com/repos/${{ github.repository }}/statuses/${{ github.sha }}"
--- a/2
+++ b/2
@@ -1,4 +1,4 @@
-FROM jumpserver/core-base:20260401_091517 AS stage-build
+FROM jumpserver/core-base:20260423_031635 AS stage-build

 ARG VERSION

--- a/2
+++ b/2
@@ -43,7 +43,7 @@ RUN set -ex \
 WORKDIR /opt/jumpserver

 ARG PIP_MIRROR=https://pypi.org/simple
-ENV ANSIBLE_COLLECTIONS_PATHS=/opt/py3/lib/python3.11/site-packages/ansible_collections
+ENV ANSIBLE_COLLECTIONS_PATHS=/opt/py3/lib/python3.14/site-packages/ansible_collections
 ENV LANG=en_US.UTF-8 \
    LC_ALL=en_US.UTF-8 \
    PATH=/opt/py3/bin:$PATH
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -145,6 +145,7 @@ dependencies = [
    'azure-storage-blob==12.17.0',
    'esdk-obs-python==3.21.4',
    'oss2==2.18.1',
+    'aliyun-python-sdk-core<2.16.0',
    'boto3==1.42.93',
    'botocore==1.42.93',
    's3transfer==0.16.0',
@@ -192,7 +193,7 @@ xpack = [
 ]

 [tool.uv.sources]
-ansible-core = { url = "https://github.com/jumpserver-dev/ansible/archive/refs/tags/v2.20.2.zip" }
+ansible-core = { url = "https://github.com/jumpserver-dev/ansible/archive/refs/tags/v2.20.3.zip" }
 ansible-runner = { url = "https://github.com/jumpserver-dev/ansible-runner/archive/refs/tags/v2.4.0.2.zip" }
 django-cas-ng = { url = "https://github.com/ibuler/django-cas-ng/releases/download/v4.3.2/django-cas-ng-4.3.2.zip" }
 django-radius = { url = "https://github.com/ibuler/django-radius/archive/refs/tags/1.5.0.zip" }