Build/2.8.x cleanup

.devcontainer/Dockerfile

@@ -1,12 +1,9 @@
-FROM kong/kong:3.0.0-ubuntu
+FROM kong/kong:2.7.0
 
 USER root
 
-RUN apt-get update
-
-RUN apt-get install -y \
-        build-essential \
-        unzip \
-        git \
-        m4 \
-        libyaml-dev
+RUN apk add --update \
+        alpine-sdk \
+        build-base \
+        bsd-compat-headers \
+        m4

.github/matrix-full.yml

@@ -37,10 +37,10 @@ build-packages:
 
   # Amazon Linux
 - label: amazonlinux-2
-  image: amazonlinux:2
   package: rpm
   package-type: aws2
   check-manifest-suite: amazonlinux-2-amd64
+  bazel-args: --platforms=//:aws2-crossbuild-x86_64
 - label: amazonlinux-2023
   image: amazonlinux:2023
   package: rpm

.github/workflows/release.yml

@@ -1,9 +1,6 @@
 name: Package & Release
 
 # The workflow to build and release official Kong packages and images.
-#
-# TODO:
-# Do not bump the version of actions/checkout to v4 before dropping rhel7 and amazonlinux2.
 
 on:  # yamllint disable-line rule:truthy
   pull_request:
@@ -130,15 +127,15 @@ jobs:
 
     - name: Cache Git
       id: cache-git
-      if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != ''
-      uses: actions/cache@v3
+      if: (matrix.package == 'rpm') && matrix.image != ''
+      uses: actions/cache@e12d46a63a90f2fae62d114769bbf2a179198b5c # v3, DO NOT BUMP, v4 BREAKS ON CENTOS7 OR AMAZONLINUX2
       with:
         path: /usr/local/git
         key: ${{ matrix.label }}-git-2.41.0
 
-    # el-7,8, amazonlinux-2,2023, debian-10 doesn't have git 2.18+, so we need to install it manually
+    # el-7,8, amazonlinux-2,2023 doesn't have git 2.18+, so we need to install it manually
     - name: Install newer Git
-      if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != '' && steps.cache-git.outputs.cache-hit != 'true'
+      if: (matrix.package == 'rpm') && matrix.image != '' && steps.cache-git.outputs.cache-hit != 'true'
       run: |
         if which apt 2>/dev/null; then
           apt update
@@ -152,28 +149,16 @@ jobs:
         tar xf git-2.41.0.tar.gz
         cd git-2.41.0
 
-        # https://gitlab.com/gitlab-org/omnibus-gitlab/-/merge_requests/5948/diffs
-        if [[ ${{ matrix.image }} == "centos:7" ]]; then
-          echo 'CFLAGS=-std=gnu99' >> config.mak
-        fi
-
         make configure
         ./configure --prefix=/usr/local/git
         make -j$(nproc)
         make install
 
     - name: Add Git to PATH
-      if: (matrix.package == 'rpm' || matrix.image == 'debian:10') && matrix.image != ''
+      if: (matrix.package == 'rpm') && matrix.image != ''
       run: |
         echo "/usr/local/git/bin" >> $GITHUB_PATH
 
-    - name: Debian Git dependencies
-      if: matrix.image == 'debian:10'
-      run: |
-        apt update
-        # dependencies for git
-        apt install -y wget libz-dev libssl-dev libcurl4-gnutls-dev sudo
-
     - name: Checkout Kong source code
       uses: actions/checkout@v3
 
@@ -618,7 +603,12 @@ jobs:
         CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
         CLOUDSMITH_DRY_RUN: ''
         IGNORE_CLOUDSMITH_FAILURES: ${{ vars.IGNORE_CLOUDSMITH_FAILURES }}
-        USE_CLOUDSMITH: ${{ vars.USE_CLOUDSMITH }}
+        # skip CentOS package uploads for Cloudsmith
+        #
+        # Cloudsmith doesn't support CentOS as a unique distribution
+        # there is only "el" (enterprise linux) distributions that cover all
+        # RedHat-family OSs and that distribution is covered by the rhel label
+        USE_CLOUDSMITH: ${{ ! startsWith(matrix.label, 'centos') || '' && vars.USE_CLOUDSMITH }}
       run: |
         sha256sum bazel-bin/pkg/*
 

.requirements

@@ -9,11 +9,10 @@ RESTY_PCRE_VERSION=8.45
 LIBYAML_VERSION=0.2.5
 KONG_GO_PLUGINSERVER_VERSION=v0.6.1
 KONG_BUILD_TOOLS_VERSION=4.40.1
-KONG_NGINX_MODULE_BRANCH=0.2.2
+KONG_NGINX_MODULE_BRANCH=0.2.1
 
 PCRE=8.45
-OPENSSL=1.1.1w
-LIBEXPAT=2.5.0
+OPENSSL=1.1.1o
 OPENRESTY=1.19.9.1
-LUAROCKS=3.9.2
-LUA_KONG_NGINX_MODULE=f52a34c17af4543245ff79e3227b9d514b8cfa5c # 0.2.2
+LUAROCKS=3.8.0
+LUA_KONG_NGINX_MODULE=6b2fa308e091e2daed2407dc38d54fbcd8fae768 # 0.2.1-sr1

BUILD.bazel

@@ -50,18 +50,6 @@ nfpm_pkg(
     visibility = ["//visibility:public"],
 )
 
-nfpm_pkg(
-    name = "kong_el7",
-    config = "//build:package/nfpm.yaml",
-    env = nfpm_env,
-    extra_env = {
-        "RPM_EXTRA_DEPS": "hostname",
-    },
-    packager = "rpm",
-    pkg_name = "kong.el7",
-    visibility = ["//visibility:public"],
-)
-
 nfpm_pkg(
     name = "kong_aws2",
     config = "//build:package/nfpm.yaml",
@@ -205,10 +193,20 @@ platform(
     for vendor in aarch64_glibc_distros
 ]
 
+platform(
+    name = "aws2-crossbuild-x86_64",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        "//build/platforms/distro:aws2",
+        ":cross_build",
+    ],
+)
+
 # config_settings define a select() condition based on user-set constraint_values
 # see https://bazel.build/docs/configurable-attributes
 config_setting(
-    name = "aarch64-linux-anylibc-cross",
+    name = "aarch64-linux-glibc-cross",
     constraint_values = [
         "@platforms//os:linux",
         "@platforms//cpu:aarch64",
@@ -228,12 +226,23 @@ config_setting(
     visibility = ["//visibility:public"],
 )
 
+config_setting(
+    name = "x86_64-linux-glibc-cross",
+    constraint_values = [
+        "@platforms//os:linux",
+        "@platforms//cpu:x86_64",
+        ":cross_build",
+    ],
+    visibility = ["//visibility:public"],
+)
+
 selects.config_setting_group(
     # matches all cross build platforms
     name = "any-cross",
     match_any = [
-        ":aarch64-linux-anylibc-cross",
+        ":aarch64-linux-glibc-cross",
         ":x86_64-linux-musl-cross",
+        ":x86_64-linux-glibc-cross",
     ],
     visibility = ["//visibility:public"],
 )

CHANGELOG.md

@@ -102,10 +102,6 @@
 
 - **HTTP Log**: fix internal error during validating the schema if http_endpoint contains
   userinfo but headers is empty [#9574](https://github.com/Kong/kong/pull/9574)
-- Update the batch queues module so that queues no longer grow without bounds if
-  their consumers fail to process the entries.  Instead, old batches are now dropped
-  and an error is logged.
-  [#10247](https://github.com/Kong/kong/pull/10247)
 
 ##### CLI
 

build/README.md

@@ -69,11 +69,9 @@ GITHUB_TOKEN=token bazel build --config release //build:kong --verbose_failures
 
 Supported build targets for binary packages:
 - `:kong_deb`
-- `:kong_el7`
 - `:kong_el8`
 - `:kong_aws2`
 - `:kong_aws2023`
-- `:kong_apk`
 
 For example, to build the deb package:
 

build/cross_deps/libxcrypt/BUILD.libxcrypt.bazel

@@ -26,8 +26,11 @@ configure_make(
     configure_command = "configure",
     configure_in_place = True,
     configure_options = select({
-        "@kong//:aarch64-linux-anylibc-cross": [
-            "--host=aarch64-linux",
+        "@kong//:aarch64-linux-glibc-cross": [
+            "--host=aarch64-unknown-linux-gnu",
+        ],
+        "@kong//:x86_64-linux-glibc-cross": [
+            "--host=x86_64-unknown-linux-gnu",
         ],
         "@kong//:x86_64-linux-musl-cross": [
             "--host=x86_64-linux-musl",

build/cross_deps/libyaml/BUILD.libyaml.bazel

@@ -14,8 +14,11 @@ configure_make(
     configure_command = "configure",
     configure_in_place = True,
     configure_options = select({
-        "@kong//:aarch64-linux-anylibc-cross": [
-            "--host=aarch64-linux",
+        "@kong//:aarch64-linux-glibc-cross": [
+            "--host=aarch64-unknown-linux-gnu",
+        ],
+        "@kong//:x86_64-linux-glibc-cross": [
+            "--host=x86_64-unknown-linux-gnu",
         ],
         "@kong//:x86_64-linux-musl-cross": [
             "--host=x86_64-linux-musl",

build/luarocks/luarocks_repositories.bzl

@@ -12,7 +12,7 @@ def luarocks_repositories():
         name = "luarocks",
         build_file = "//build/luarocks:BUILD.luarocks.bazel",
         strip_prefix = "luarocks-" + version,
-        sha256 = "bca6e4ecc02c203e070acdb5f586045d45c078896f6236eb46aa33ccd9b94edb",
+        sha256 = "56ab9b90f5acbc42eb7a94cf482e6c058a63e8a1effdf572b8b2a6323a06d923",
         urls = [
             "https://luarocks.org/releases/luarocks-" + version + ".tar.gz",
         ],

build/openresty/BUILD.openresty.bazel

@@ -152,7 +152,7 @@ CONFIGURE_OPTIONS = [
     "--add-module=$$EXT_BUILD_ROOT$$/external/lua-kong-nginx-module",
     "--add-module=$$EXT_BUILD_ROOT$$/external/lua-kong-nginx-module/stream",
 ] + select({
-    "@kong//:aarch64-linux-anylibc-cross": [
+    "@kong//:aarch64-linux-glibc-cross": [
         "--crossbuild=Linux:aarch64",
         "--with-endian=little",
         "--with-int=4",
@@ -165,6 +165,19 @@ CONFIGURE_OPTIONS = [
         "--with-time-t=8",
         "--with-sys-nerr=132",
     ],
+    "@kong//:x86_64-linux-glibc-cross": [
+        "--crossbuild=Linux:x86_64",
+        "--with-endian=little",
+        "--with-int=4",
+        "--with-long=8",
+        "--with-long-long=8",
+        "--with-ptr-size=8",
+        "--with-sig-atomic-t=4",
+        "--with-size-t=8",
+        "--with-off-t=8",
+        "--with-time-t=8",
+        "--with-sys-nerr=132",
+    ],
     "@kong//:x86_64-linux-musl-cross": [
         "--crossbuild=Linux:x86_64",
         "--with-endian=little",
@@ -188,7 +201,7 @@ CONFIGURE_OPTIONS = [
 }) + select({
     # any cross build that migrated to use libxcrypt needs those flags
     # alpine uses different libc so doesn't need it
-    "@kong//:aarch64-linux-anylibc-cross": [
+    "@kong//:aarch64-linux-glibc-cross": [
         "--with-cc-opt=\"-I$$EXT_BUILD_DEPS$$/libxcrypt/include\"",
         "--with-ld-opt=\"-L$$EXT_BUILD_DEPS$$/libxcrypt/lib\"",
     ],

build/openresty/openssl/openssl.bzl

@@ -11,11 +11,19 @@ load("@kong_bindings//:variables.bzl", "KONG_VAR")
 # Read https://wiki.openssl.org/index.php/Compilation_and_Installation
 
 CONFIGURE_OPTIONS = select({
-    "@kong//:aarch64-linux-anylibc-cross": [
+    "@kong//:aarch64-linux-glibc-cross": [
+        "linux-aarch64",
+    ],
+    "@kong//:x86_64-linux-glibc-cross": [
+        "linux-x86_64",
+    ],
+    # non-cross build
+    "@platforms//cpu:x86_64": [
+        "linux-x86_64",
+    ],
+    "@platforms//cpu:aarch64": [
         "linux-aarch64",
     ],
-    # no extra args needed for "@kong//:x86_64-linux-musl-cross" or non-cross builds
-    "//conditions:default": [],
 }) + [
     "-g",
     "-O3",  # force -O3 even we are using --debug (for example on CI)
@@ -47,7 +55,7 @@ def build_openssl(
 
     configure_make(
         name = name,
-        configure_command = "config",
+        configure_command = "Configure",
         configure_in_place = True,
         configure_options = CONFIGURE_OPTIONS + extra_configure_options,
         env = select({

build/openresty/openssl/openssl_repositories.bzl

@@ -12,7 +12,7 @@ def openssl_repositories():
         http_archive,
         name = "openssl",
         build_file = "//build/openresty/openssl:BUILD.bazel",
-        sha256 = "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8",
+        sha256 = "9384a2b0570dd80358841464677115df785edb941c71211f75076d72fe6b438f",
         strip_prefix = "openssl-" + version,
         urls = [
             "https://www.openssl.org/source/openssl-" + version + ".tar.gz",