feat: build deb package for ubuntu 24.04

.github/workflows/package-apisix-deb-ubuntu20.04.yml

@@ -1,4 +1,4 @@
-name: package apisix deb for ubuntu 20.04(Focal Fossa)
+name: package apisix deb for ubuntu 24.04
 
 on:
   push:
@@ -34,11 +34,11 @@ jobs:
       - name: run apisix packaging
         run: |
           wget https://raw.githubusercontent.com/apache/apisix/${APISIX_VERSION}/.requirements && source .requirements
-          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=20.04
+          make package type=deb app=apisix version=${PACKAGE_APISIX_VERSION} runtime_version=${APISIX_RUNTIME} checkout=${APISIX_VERSION} image_base=ubuntu image_tag=24.04
 
       - name: install apisix deb into container
         run: |
-          docker build -t apache/apisix:${PACKAGE_APISIX_VERSION}-deb-test --build-arg APISIX_VERSION=${PACKAGE_APISIX_VERSION} -f test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 .
+          docker build -t apache/apisix:${PACKAGE_APISIX_VERSION}-deb-test --build-arg APISIX_VERSION=${PACKAGE_APISIX_VERSION} -f test/apisix/Dockerfile.test.apisix.deb.ubuntu24.04 .
 
       - name: start apisix and test
         run: |
@@ -74,7 +74,7 @@ jobs:
       - name: Publish Artifact
         uses: actions/[email protected]
         with:
-          name: apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu20.04_amd64.deb
-          path: output/apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu20.04_amd64.deb
+          name: apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu24.04_amd64.deb
+          path: output/apisix_${{ env.PACKAGE_APISIX_VERSION }}-0~ubuntu24.04_amd64.deb
           retention-days: 5
           if-no-files-found: error

.github/workflows/package-apisix-runtime-deb-ubuntu20.04.yml

@@ -1,4 +1,4 @@
-name: package apisix-runtime deb for ubuntu 20.04(Focal Fossa)
+name: package apisix-runtime deb for ubuntu 24.04
 
 on:
   push:
@@ -29,26 +29,26 @@ jobs:
 
       - name: build apisix-runtime deb
         run: |
-          make package type=deb app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=ubuntu image_tag=20.04
+          make package type=deb app=apisix-runtime runtime_version=${BUILD_APISIX_RUNTIME_VERSION} image_base=ubuntu image_tag=24.04
 
-      - name: run ubuntu 20.04 docker and mapping apisix-runtime deb into container
+      - name: run ubuntu 24.04 docker and mapping apisix-runtime deb into container
         run: |
-          docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubuntu20.04Instance --net="host" docker.io/ubuntu:20.04 /bin/bash
+          docker run -itd -v /home/runner/work/apisix-build-tools/apisix-build-tools/output:/output --name ubuntu24.04Instance --net="host" docker.io/ubuntu:24.04 /bin/bash
 
       - name: install deb in container
         run: |
-          docker exec ubuntu20.04Instance bash -c "dpkg -i /output/apisix-runtime_${BUILD_APISIX_RUNTIME_VERSION}-0~ubuntu20.04_amd64.deb"
+          docker exec ubuntu24.04Instance bash -c "dpkg -i /output/apisix-runtime_${BUILD_APISIX_RUNTIME_VERSION}-0~ubuntu24.04_amd64.deb"
 
       - name: check and ensure apisix-runtime is installed
         run: |
-          docker exec ubuntu20.04Instance bash -c "/usr/local/openresty/bin/etcdctl -h" || exit 1
-          export APISIX_RUNTIME_VER=$(docker exec ubuntu20.04Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_RUNTIME_VER=/{print $5}' | awk -v FS="=" '{print $2}')
+          docker exec ubuntu24.04Instance bash -c "/usr/local/openresty/bin/etcdctl -h" || exit 1
+          export APISIX_RUNTIME_VER=$(docker exec ubuntu24.04Instance bash -c "openresty -V" 2>&1 | awk '/-O2 -DAPISIX_RUNTIME_VER=/{print $5}' | awk -v FS="=" '{print $2}')
           if [ "$APISIX_RUNTIME_VER" != "${BUILD_APISIX_RUNTIME_VERSION}" ]; then exit 1; fi
 
       - name: Publish Artifact
         uses: actions/[email protected]
         with:
-          name: apisix-runtime_${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0~ubuntu20.04_amd64.deb
-          path: output/apisix-runtime_${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0~ubuntu20.04_amd64.deb
+          name: apisix-runtime_${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0~ubuntu24.04_amd64.deb
+          path: output/apisix-runtime_${{ env.BUILD_APISIX_RUNTIME_VERSION }}-0~ubuntu24.04_amd64.deb
           retention-days: 5
           if-no-files-found: error

.github/workflows/publish-deb.yml

@@ -16,19 +16,26 @@ jobs:
       fail-fast: false
       matrix:
         platform:
-        - runner: ubuntu-latest
-          arch: amd64
-        - runner: ubuntu-24.04-arm
-          arch: arm64
+          - runner: ubuntu-latest
+            arch: amd64
+          - runner: ubuntu-24.04-arm
+            arch: arm64
+        target:
+          - os: debian
+            codename: bullseye
+            release: bullseye-slim
+          - os: ubuntu
+            codename: noble
+            release: 24.04
     runs-on: ${{ matrix.platform.runner }}
     timeout-minutes: 60
     env:
       VAR_DEB_WORKBENCH_DIR: /tmp/output
       VAR_COS_BUCKET_REPO: ${{ secrets.VAR_COS_BUCKET_REPO }}
       VAR_COS_BUCKET_CI: ${{ secrets.VAR_COS_BUCKET_CI }}
-      VAR_OS: debian
-      VAR_CODENAME: bullseye
-      VAR_OS_RELEASE: bullseye-slim
+      VAR_OS: ${{ matrix.target.os }}
+      VAR_CODENAME: ${{ matrix.target.codename }}
+      VAR_OS_RELEASE: ${{ matrix.target.release }}
       ARCH: ${{ matrix.platform.arch }}
 
     steps:

test/apisix/Dockerfile.test.apisix.arm64.ubuntu20.04 → test/apisix/Dockerfile.test.apisix.arm64.ubuntu24.04

@@ -1,5 +1,5 @@
 ARG IMAGE_BASE="ubuntu"
-ARG IMAGE_TAG="20.04"
+ARG IMAGE_TAG="24.04"
 
 FROM ${IMAGE_BASE}:${IMAGE_TAG}
 
@@ -31,4 +31,4 @@ RUN set -x \
 # start etcd and test
 CMD ["sh", "-c", "(ETCD_UNSUPPORTED_ARCH=arm64 nohup etcd-$RUNNING_ETCD_VERSION-linux-arm64/etcd >/tmp/etcd.log 2>&1 &) && sleep 10 && apisix start && sleep 3600"]
 
-EXPOSE 9180 9080 9443
+EXPOSE 9180 9080 9443

test/apisix/Dockerfile.test.apisix.deb.ubuntu20.04 → test/apisix/Dockerfile.test.apisix.deb.ubuntu24.04

@@ -1,5 +1,5 @@
 ARG IMAGE_BASE="ubuntu"
-ARG IMAGE_TAG="20.04"
+ARG IMAGE_TAG="24.04"
 
 FROM ${IMAGE_BASE}:${IMAGE_TAG}