f

Signed-off-by: Nic <[email protected]>

Author: nic-6443

.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

.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/[email protected]
         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 }}

VERSION

@@ -1 +1 @@
-1.2.2
+1.2.4

build-api7ee-runtime.sh

@@ -20,7 +20,7 @@ ld_opt=${ld_opt:-"-L$zlib_prefix/lib -L$pcre_prefix/lib -L$OPENSSL_PREFIX/lib -W
 
 
 # dependencies for building openresty
-OPENSSL_VERSION=${OPENSSL_VERSION:-"3.2.3"}
+OPENSSL_VERSION=${OPENSSL_VERSION:-"3.2.4"}
 OPENRESTY_VERSION="1.21.4.4"
 ngx_multi_upstream_module_ver="1.1.1"
 mod_dubbo_ver="1.0.2"

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
 

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