From f9e6f39dbcbac5cc199392b06d0dd73a80f39e66 Mon Sep 17 00:00:00 2001 From: Isa Farnik Date: Mon, 9 Sep 2024 10:28:03 -0700 Subject: [PATCH] feat: Add Ubuntu 24.04 to build matrix (#13626) * feat: add ubuntu 24.04 to build matrix * fix(bazel): libxcrypt 2404 version comment Co-authored-by: Wangchong Zhou * fix(gha): rm unneeded python on runner --------- Co-authored-by: Wangchong Zhou --- .github/matrix-commitly.yml | 11 +- .github/matrix-full.yml | 28 ++- .github/workflows/release.yml | 8 +- build/README.md | 2 +- build/cross_deps/README.md | 1 + .../001-4.4.27-enable-hash-all.patch | 70 ++++++ build/cross_deps/libxcrypt/repositories.bzl | 3 + .../unreleased/kong/add-noble-numbat.yml | 2 + scripts/explain_manifest/config.py | 23 ++ .../fixtures/ubuntu-24.04-amd64.txt | 209 ++++++++++++++++++ .../fixtures/ubuntu-24.04-arm64.txt | 207 +++++++++++++++++ scripts/explain_manifest/suites.py | 5 +- scripts/release-kong.sh | 3 + 13 files changed, 556 insertions(+), 16 deletions(-) create mode 100644 build/cross_deps/libxcrypt/001-4.4.27-enable-hash-all.patch create mode 100644 changelog/unreleased/kong/add-noble-numbat.yml create mode 100644 scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt create mode 100644 scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt diff --git a/.github/matrix-commitly.yml b/.github/matrix-commitly.yml index 5e52cbc80f73..1a2962ab225f 100644 --- a/.github/matrix-commitly.yml +++ b/.github/matrix-commitly.yml @@ -1,15 +1,16 @@ # please see matrix-full.yml for meaning of each field build-packages: -- label: ubuntu-22.04 - image: ubuntu:22.04 +- label: ubuntu-24.04 + image: ubuntu:24.04 package: deb - check-manifest-suite: ubuntu-22.04-amd64 + check-manifest-suite: ubuntu-24.04-amd64 build-images: - label: ubuntu - base-image: ubuntu:22.04 + base-image: ubuntu:24.04 package: deb - artifact-from: ubuntu-22.04 + artifact-from: ubuntu-24.04 + check-manifest-suite: docker-image-ubuntu-24.04 smoke-tests: - label: ubuntu diff --git a/.github/matrix-full.yml b/.github/matrix-full.yml index e8379aa5160c..72822d0a94e7 100644 --- a/.github/matrix-full.yml +++ b/.github/matrix-full.yml @@ -20,6 +20,15 @@ build-packages: package: deb bazel-args: --platforms=//:generic-crossbuild-aarch64 check-manifest-suite: ubuntu-22.04-arm64 +- label: ubuntu-24.04 + image: ubuntu:24.04 + package: deb + check-manifest-suite: ubuntu-24.04-amd64 +- label: ubuntu-24.04-arm64 + image: ubuntu:24.04 + package: deb + bazel-args: --platforms=//:generic-crossbuild-aarch64 + check-manifest-suite: ubuntu-24.04-arm64 # Debian - label: debian-11 @@ -78,11 +87,12 @@ build-images: # Ubuntu - label: ubuntu - base-image: ubuntu:22.04 + base-image: ubuntu:24.04 package: deb - artifact-from: ubuntu-22.04 - artifact-from-alt: ubuntu-22.04-arm64 + artifact-from: ubuntu-24.04 + artifact-from-alt: ubuntu-24.04-arm64 docker-platforms: linux/amd64, linux/arm64 + check-manifest-suite: docker-image-ubuntu-24.04 # Debian - label: debian @@ -129,6 +139,18 @@ release-packages: artifact-version: 22.04 artifact-type: ubuntu artifact: kong.arm64.deb +- label: ubuntu-24.04 + package: deb + artifact-from: ubuntu-24.04 + artifact-version: 24.04 + artifact-type: ubuntu + artifact: kong.amd64.deb +- label: ubuntu-24.04-arm64 + package: deb + artifact-from: ubuntu-24.04-arm64 + artifact-version: 24.04 + artifact-type: ubuntu + artifact: kong.arm64.deb # Debian - label: debian-11 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 7d18c25e2304..94192420cf32 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -419,17 +419,19 @@ jobs: cache: 'pip' # caching pip dependencies - name: Verify + env: + SUITE: ${{ matrix.check-manifest-suite || 'docker-image' }} run: | cd scripts/explain_manifest # docker image verify requires sudo to set correct permissions, so we # also install deps for root - sudo -E pip install -r requirements.txt + sudo -H -E pip install -r requirements.txt IMAGE=${{ env.PRERELEASE_DOCKER_REPOSITORY }}:${{ needs.metadata.outputs.commit-sha }}-${{ matrix.label }} - sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s docker-image + sudo -H -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s "$SUITE" if [[ ! -z "${{ matrix.docker-platforms }}" ]]; then - DOCKER_DEFAULT_PLATFORM=linux/arm64 sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s docker-image + DOCKER_DEFAULT_PLATFORM=linux/arm64 sudo -E python ./main.py --image $IMAGE -f docker_image_filelist.txt -s "$SUITE" fi scan-images: diff --git a/build/README.md b/build/README.md index b3d224d1aa7e..7774fd6081d7 100644 --- a/build/README.md +++ b/build/README.md @@ -220,7 +220,7 @@ time to control how the ngx_wasm_module repository is sourced: ## Cross compiling -Cross compiling is currently only tested on Ubuntu 22.04 x86_64 with following targeting platforms: +Cross compiling is currently only tested on Ubuntu 22.04/24.04 x86_64 with following targeting platforms: - **//:generic-crossbuild-aarch64** Use the system installed aarch64 toolchain. - Requires user to manually install `crossbuild-essential-arm64` on Debian/Ubuntu. diff --git a/build/cross_deps/README.md b/build/cross_deps/README.md index e2d52bf33b25..5cef3992437c 100644 --- a/build/cross_deps/README.md +++ b/build/cross_deps/README.md @@ -17,6 +17,7 @@ We currently do cross compile on following platforms: - Amazonlinux 2023 - Ubuntu 18.04 (Version 3.4.x.x only) - Ubuntu 22.04 +- Ubuntu 24.04 - RHEL 9 - Debian 12 diff --git a/build/cross_deps/libxcrypt/001-4.4.27-enable-hash-all.patch b/build/cross_deps/libxcrypt/001-4.4.27-enable-hash-all.patch new file mode 100644 index 000000000000..17891137fa36 --- /dev/null +++ b/build/cross_deps/libxcrypt/001-4.4.27-enable-hash-all.patch @@ -0,0 +1,70 @@ +This is roughly adapted from https://patchwork.yoctoproject.org/project/oe-core/patch/20230726131331.2239727-1-Martin.Jansa@gmail.com +Which is a patch adopted around 4.4.30 upstream. + +diff --color -Naur a/build-aux/scripts/BuildCommon.pm b/build-aux/scripts/BuildCommon.pm +--- a/build-aux/scripts/BuildCommon.pm 2021-12-17 07:16:06.000000000 -0800 ++++ b/build-aux/scripts/BuildCommon.pm 2024-09-05 12:47:53.534533364 -0700 +@@ -519,19 +519,19 @@ + my $COMPAT_ABI; + local $_; + for (@args) { +- when (/^SYMVER_MIN=(.+)$/) { ++ if (/^SYMVER_MIN=(.+)$/) { + $usage_error->() if defined $SYMVER_MIN; + $SYMVER_MIN = $1; + } +- when (/^SYMVER_FLOOR=(.+)$/) { ++ elsif (/^SYMVER_FLOOR=(.+)$/) { + $usage_error->() if defined $SYMVER_FLOOR; + $SYMVER_FLOOR = $1; + } +- when (/^COMPAT_ABI=(.+)$/) { ++ elsif (/^COMPAT_ABI=(.+)$/) { + $usage_error->() if defined $COMPAT_ABI; + $COMPAT_ABI = $1; + } +- default { ++ else { + $usage_error->() if defined $map_in; + $map_in = $_; + } +diff --color -Naur a/build-aux/scripts/gen-crypt-h b/build-aux/scripts/gen-crypt-h +--- a/build-aux/scripts/gen-crypt-h 2021-12-17 07:16:06.000000000 -0800 ++++ b/build-aux/scripts/gen-crypt-h 2024-09-05 12:48:58.446980478 -0700 +@@ -37,22 +37,20 @@ + local $_; + while (<$fh>) { + chomp; +- # Yes, 'given $_' is really required here. +- given ($_) { +- when ('#define HAVE_SYS_CDEFS_H 1') { +- $have_sys_cdefs_h = 1; +- } +- when ('#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { +- $have_sys_cdefs_begin_end_decls = 1; +- } +- when ('#define HAVE_SYS_CDEFS_THROW 1') { +- $have_sys_cdefs_throw = 1; +- } +- when (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { +- $substs{XCRYPT_VERSION_STR} = $1; +- $substs{XCRYPT_VERSION_MAJOR} = $2; +- $substs{XCRYPT_VERSION_MINOR} = $3; +- } ++ ++ if ($_ eq '#define HAVE_SYS_CDEFS_H 1') { ++ $have_sys_cdefs_h = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_BEGIN_END_DECLS 1') { ++ $have_sys_cdefs_begin_end_decls = 1; ++ } ++ elsif ($_ eq '#define HAVE_SYS_CDEFS_THROW 1') { ++ $have_sys_cdefs_throw = 1; ++ } ++ elsif (/^#define PACKAGE_VERSION "((\d+)\.(\d+)\.\d+)"$/) { ++ $substs{XCRYPT_VERSION_STR} = $1; ++ $substs{XCRYPT_VERSION_MAJOR} = $2; ++ $substs{XCRYPT_VERSION_MINOR} = $3; + } + } + diff --git a/build/cross_deps/libxcrypt/repositories.bzl b/build/cross_deps/libxcrypt/repositories.bzl index ec6d450ba467..edce21d0be33 100644 --- a/build/cross_deps/libxcrypt/repositories.bzl +++ b/build/cross_deps/libxcrypt/repositories.bzl @@ -9,6 +9,7 @@ def libxcrypt_repositories(): # thus crypt.h and libcrypt.so.1 are missing from cross tool chain # ubuntu2004: 4.4.10 # ubuntu2204: 4.4.27 + # ubuntu2404: 4.4.36 # NOTE: do not bump the following version, see build/cross_deps/README.md for detail. http_archive( name = "cross_deps_libxcrypt", @@ -16,4 +17,6 @@ def libxcrypt_repositories(): sha256 = "500898e80dc0d027ddaadb5637fa2bf1baffb9ccd73cd3ab51d92ef5b8a1f420", strip_prefix = "libxcrypt-4.4.27", build_file = "//build/cross_deps/libxcrypt:BUILD.libxcrypt.bazel", + patches = ["//build/cross_deps/libxcrypt:001-4.4.27-enable-hash-all.patch"], + patch_args = ["-p1"], ) diff --git a/changelog/unreleased/kong/add-noble-numbat.yml b/changelog/unreleased/kong/add-noble-numbat.yml new file mode 100644 index 000000000000..b841eeafde3d --- /dev/null +++ b/changelog/unreleased/kong/add-noble-numbat.yml @@ -0,0 +1,2 @@ +message: "Add Ubuntu 24.04 (Noble Numbat) to build" +type: dependency diff --git a/scripts/explain_manifest/config.py b/scripts/explain_manifest/config.py index ceeab15b376c..04e19f4830ed 100644 --- a/scripts/explain_manifest/config.py +++ b/scripts/explain_manifest/config.py @@ -125,6 +125,19 @@ def transform(f: FileInfo): }, } ), + "ubuntu-24.04-amd64": ExpectSuite( + name="Ubuntu 24.04 (amd64)", + manifest="fixtures/ubuntu-24.04-amd64.txt", + tests={ + common_suites: {}, + libc_libcpp_suites: { + "libc_max_version": "2.35", + # gcc 11.2.0 + "libcxx_max_version": "3.4.29", + "cxxabi_max_version": "1.3.13", + }, + } + ), "debian-11-amd64": ExpectSuite( name="Debian 11 (amd64)", manifest="fixtures/debian-11-amd64.txt", @@ -158,6 +171,16 @@ def transform(f: FileInfo): docker_suites: {}, } ), + "docker-image-ubuntu-24.04": ExpectSuite( + name="Ubuntu 24.04 Docker Image", + manifest=None, + tests={ + docker_suites: { + "kong_uid": 1001, + "kong_gid": 1001, + }, + } + ), } # populate arm64 and fips suites from amd64 suites diff --git a/scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt b/scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt new file mode 100644 index 000000000000..e0cdc94ca3b3 --- /dev/null +++ b/scripts/explain_manifest/fixtures/ubuntu-24.04-amd64.txt @@ -0,0 +1,209 @@ +- Path : /etc/kong/kong.logrotate + +- Path : /lib/systemd/system/kong.service + +- Path : /usr/local/kong/gui + Type : directory + +- Path : /usr/local/kong/include/google + Type : directory + +- Path : /usr/local/kong/include/kong + Type : directory + +- Path : /usr/local/kong/lib/engines-3/afalg.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/capi.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/loader_attic.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/padlock.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libada.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libgcc_s.so.1 + - libc.so.6 + +- Path : /usr/local/kong/lib/libcrypto.so.3 + Needed : + - libstdc++.so.6 + - libm.so.6 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libexpat.so.1.9.2 + Needed : + - libc.so.6 + +- Path : /usr/local/kong/lib/libsnappy.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libgcc_s.so.1 + - libc.so.6 + +- Path : /usr/local/kong/lib/libssl.so.3 + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/ossl-modules/legacy.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lfs.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lpeg.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lsyslog.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_pack.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_system_constants.so + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lxp.so + Needed : + - libexpat.so.1 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/mime/core.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/pb.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/core.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/serial.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/unix.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/ssl.so + Needed : + - libssl.so.3 + - libcrypto.so.3 + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/yaml.so + Needed : + - libyaml-0.so.2 + - libc.so.6 + +- Path : /usr/local/openresty/lualib/cjson.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/lualib/librestysignal.so + +- Path : /usr/local/openresty/lualib/rds/parser.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/lualib/redis/parser.so + Needed : + - libc.so.6 + +- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so + Needed : + - libm.so.6 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-x86-64.so.2 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + +- Path : /usr/local/openresty/nginx/sbin/nginx + Needed : + - libcrypt.so.1 + - libluajit-5.1.so.2 + - libm.so.6 + - libssl.so.3 + - libcrypto.so.3 + - libz.so.1 + - libc.so.6 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + Modules : + - lua-kong-nginx-module + - lua-kong-nginx-module/stream + - lua-resty-events + - lua-resty-lmdb + - ngx_brotli + - ngx_wasmx_module + OpenSSL : OpenSSL 3.2.1 30 Jan 2024 + DWARF : True + DWARF - ngx_http_request_t related DWARF DIEs: True + +- Path : /usr/local/openresty/site/lualib/libatc_router.so + Needed : + - libgcc_s.so.1 + - libm.so.6 + - libc.so.6 + - ld-linux-x86-64.so.2 + - libstdc++.so.6 + +- Path : /usr/local/openresty/site/lualib/libsimdjson_ffi.so + Needed : + - libstdc++.so.6 + - libm.so.6 + - libgcc_s.so.1 + - libc.so.6 diff --git a/scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt b/scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt new file mode 100644 index 000000000000..6b1664c89895 --- /dev/null +++ b/scripts/explain_manifest/fixtures/ubuntu-24.04-arm64.txt @@ -0,0 +1,207 @@ +- Path : /etc/kong/kong.logrotate + +- Path : /lib/systemd/system/kong.service + +- Path : /usr/local/kong/gui + Type : directory + +- Path : /usr/local/kong/include/google + Type : directory + +- Path : /usr/local/kong/include/kong + Type : directory + +- Path : /usr/local/kong/lib/engines-3/afalg.so + Needed : + - libcrypto.so.3 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/capi.so + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/loader_attic.so + Needed : + - libcrypto.so.3 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/engines-3/padlock.so + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libada.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/kong/lib/libcrypto.so.3 + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/libexpat.so.1.9.2 + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/kong/lib/libsnappy.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/kong/lib/libssl.so.3 + Needed : + - libcrypto.so.3 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/kong/lib/ossl-modules/legacy.so + Needed : + - libcrypto.so.3 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lfs.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lpeg.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lsyslog.so + Needed : + - libc.so.6 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_pack.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lua_system_constants.so + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/lxp.so + Needed : + - libexpat.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/mime/core.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/pb.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/core.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/serial.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/socket/unix.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/ssl.so + Needed : + - libssl.so.3 + - libcrypto.so.3 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/kong/lib + +- Path : /usr/local/lib/lua/5.1/yaml.so + Needed : + - libyaml-0.so.2 + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/openresty/lualib/cjson.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/openresty/lualib/librestysignal.so + +- Path : /usr/local/openresty/lualib/rds/parser.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/openresty/lualib/redis/parser.so + Needed : + - libc.so.6 + - ld-linux-aarch64.so.1 + +- Path : /usr/local/openresty/nginx/modules/ngx_wasmx_module.so + Needed : + - libm.so.6 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + +- Path : /usr/local/openresty/nginx/sbin/nginx + Needed : + - libcrypt.so.1 + - libluajit-5.1.so.2 + - libm.so.6 + - libssl.so.3 + - libcrypto.so.3 + - libz.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 + Runpath : /usr/local/openresty/luajit/lib:/usr/local/kong/lib:/usr/local/openresty/lualib + Modules : + - lua-kong-nginx-module + - lua-kong-nginx-module/stream + - lua-resty-events + - lua-resty-lmdb + - ngx_brotli + - ngx_wasmx_module + OpenSSL : OpenSSL 3.2.1 30 Jan 2024 + DWARF : True + DWARF - ngx_http_request_t related DWARF DIEs: True + +- Path : /usr/local/openresty/site/lualib/libatc_router.so + Needed : + - libgcc_s.so.1 + - libc.so.6 + +- Path : /usr/local/openresty/site/lualib/libsimdjson_ffi.so + Needed : + - libstdc++.so.6 + - libgcc_s.so.1 + - libc.so.6 + - ld-linux-aarch64.so.1 diff --git a/scripts/explain_manifest/suites.py b/scripts/explain_manifest/suites.py index 7c5987968ddf..ba89e4322807 100644 --- a/scripts/explain_manifest/suites.py +++ b/scripts/explain_manifest/suites.py @@ -137,10 +137,7 @@ def arm64_suites(expect): expect("/usr/local/openresty/nginx/sbin/nginx", "Nginx is arm64 arch") \ .arch.equals("AARCH64") -def docker_suites(expect): - kong_uid = 1000 - kong_gid = 1000 - +def docker_suites(expect, kong_uid: int = 1000, kong_gid: int = 1000): expect("/etc/passwd", "kong user exists") \ .text_content.matches("kong:x:%d" % kong_uid) diff --git a/scripts/release-kong.sh b/scripts/release-kong.sh index bf9cf8877c49..ad228c8bd52f 100755 --- a/scripts/release-kong.sh +++ b/scripts/release-kong.sh @@ -96,6 +96,9 @@ function push_package () { if [ "$ARTIFACT_VERSION" == "22.04" ]; then dist_version="--dist-version jammy" fi + if [ "$ARTIFACT_VERSION" == "24.04" ]; then + dist_version="--dist-version noble" + fi # test for sanitized github actions input if [[ -n "$(echo "$PACKAGE_TAGS" | tr -d 'a-zA-Z0-9._,')" ]]; then