From 0309c1d36f784814ed84f5d493604c4d422cba9b Mon Sep 17 00:00:00 2001 From: Nic Date: Mon, 16 Jun 2025 14:43:43 +0800 Subject: [PATCH] deps: upgrade debian to bookworm Signed-off-by: Nic --- .github/workflows/build.yml | 6 +++--- .github/workflows/release.yml | 4 ++-- VERSION | 2 +- dockerfiles/Dockerfile.api7ee-runtime.deb | 2 +- test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 | 2 +- 5 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml index 2874cb3b6..e1742990d 100644 --- a/.github/workflows/build.yml +++ b/.github/workflows/build.yml @@ -37,10 +37,10 @@ jobs: - name: Build api7ee-runtime deb run: | - make package type=deb app=api7ee-runtime runtime_version=${version} image_base=debian image_tag=bullseye-slim arch=${{ matrix.platform.build_arch }} + make package type=deb app=api7ee-runtime runtime_version=${version} image_base=debian image_tag=bookworm-slim arch=${{ matrix.platform.build_arch }} - name: Upload Artifact uses: actions/upload-artifact@v4 with: - name: api7ee-runtime_${{ env.version }}-0~debianbullseye-slim_${{ matrix.platform.arch }}.deb - path: ./output/api7ee-runtime_${{ env.version }}-0~debianbullseye-slim_${{ matrix.platform.arch }}.deb + name: api7ee-runtime_${{ env.version }}-0~debianbookworm-slim_${{ matrix.platform.arch }}.deb + path: ./output/api7ee-runtime_${{ env.version }}-0~debianbookworm-slim_${{ matrix.platform.arch }}.deb diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index cce785972..9ccb10b1a 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -39,7 +39,7 @@ jobs: - name: Build api7ee-runtime deb run: | - make package type=deb app=api7ee-runtime runtime_version=${version} image_base=debian image_tag=bullseye-slim arch=${{ matrix.platform.build_arch }} + make package type=deb app=api7ee-runtime runtime_version=${version} image_base=debian image_tag=bookworm-slim arch=${{ matrix.platform.build_arch }} - uses: mukunku/tag-exists-action@v1.6.0 id: check-tag @@ -64,6 +64,6 @@ jobs: body: | Release api7ee-runtime ${{ env.version }} files: | - ./output/api7ee-runtime_${{ env.version }}-0~debianbullseye-slim_${{ matrix.platform.arch }}.deb + ./output/api7ee-runtime_${{ env.version }}-0~debianbookworm-slim_${{ matrix.platform.arch }}.deb env: GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/VERSION b/VERSION index 23aa83906..0495c4a88 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -1.2.2 +1.2.3 diff --git a/dockerfiles/Dockerfile.api7ee-runtime.deb b/dockerfiles/Dockerfile.api7ee-runtime.deb index dba6b603d..e4f37c4c9 100644 --- a/dockerfiles/Dockerfile.api7ee-runtime.deb +++ b/dockerfiles/Dockerfile.api7ee-runtime.deb @@ -1,5 +1,5 @@ ARG IMAGE_BASE="debian" -ARG IMAGE_TAG="bullseye-slim" +ARG IMAGE_TAG="bookworm-slim" FROM ${IMAGE_BASE}:${IMAGE_TAG} as build diff --git a/test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 b/test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 index e84e17ee2..4f88fa3d2 100644 --- a/test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 +++ b/test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 @@ -21,7 +21,7 @@ RUN set -x \ && wget -O - https://openresty.org/package/pubkey.gpg | apt-key add - \ && wget -O - http://repos.apiseven.com/pubkey.gpg | apt-key add - \ && echo "deb http://openresty.org/package/${arch_path}ubuntu $(lsb_release -sc) main" | tee /etc/apt/sources.list.d/openresty.list \ - && echo "deb http://repos.apiseven.com/packages/debian bullseye main" | tee /etc/apt/sources.list.d/apisix.list \ + && echo "deb http://repos.apiseven.com/packages/debian bookworm main" | tee /etc/apt/sources.list.d/apisix.list \ && DEBIAN_FRONTEND=noninteractive apt-get update # install etcd