From 67bce6d59d3944719c5e6a9a62c92aa0990a8b50 Mon Sep 17 00:00:00 2001
From: Water-Melon <melon-c@hotmail.com>
Date: Fri, 5 Jul 2024 16:19:03 +0800
Subject: [PATCH] full matrix

---
 .github/matrix-commitly.yml      | 126 ++++++++++++++++++++++++++++++-
 .github/matrix-full.yml          |   2 +-
 build/dockerfiles/rpm.Dockerfile |   2 +-
 3 files changed, 125 insertions(+), 5 deletions(-)

diff --git a/.github/matrix-commitly.yml b/.github/matrix-commitly.yml
index 7685340597c37..4c63b03bfbe93 100644
--- a/.github/matrix-commitly.yml
+++ b/.github/matrix-commitly.yml
@@ -1,24 +1,144 @@
-# please see matrix-full.yml for meaning of each field
 build-packages:
+# label: used to distinguish artifacts for later use
+# image: docker image name if the build is running in side a container
+# package: package type
+# package-type: the nfpm packaging target, //:kong_{package} target; only used when package is rpm
+# bazel-args: additional bazel build flags
+# check-manifest-suite: the check manifest suite as defined in scripts/explain_manifest/config.py
+
+# Ubuntu
+- label: ubuntu-20.04
+  image: ubuntu:20.04
+  package: deb
+  check-manifest-suite: ubuntu-20.04-amd64
 - label: ubuntu-22.04
-  os: ubuntu-22.04
   package: deb
   check-manifest-suite: ubuntu-22.04-amd64
 
+# Debian
+- label: debian-11
+  image: debian:11
+  package: deb
+  check-manifest-suite: debian-11-amd64
+
+# Alpine
+- label: alpine
+  os: vars.RELEASE_RUNS_ON
+  package: apk
+  bazel-args: --platforms=//:alpine-crossbuild-x86_64
+  check-manifest-suite: alpine-amd64
+
+# RHEL
+- label: rhel-8
+  image: rockylinux:8
+  package: rpm
+  package-type: el8
+  check-manifest-suite: el8-amd64
+
+  # Amazon Linux
+- label: amazonlinux-2023
+  image: amazonlinux:2023
+  package: rpm
+  package-type: aws2023
+  check-manifest-suite: amazonlinux-2023-amd64
+
 build-images:
+# Only build images for the latest version of each major release.
+
+# label: used as compose docker image label ${github.sha}-${label}
+# base-image: docker image to use as base
+# package: package type
+# artifact-from: label of build-packages to use
+# artifact-from-alt: another label of build-packages to use for downloading package (to build multi-arch image)
+# docker-platforms: comma separated list of docker buildx platforms to build for
+
+# Ubuntu
 - label: ubuntu
   base-image: ubuntu:22.04
   package: deb
   artifact-from: ubuntu-22.04
+  docker-platforms: linux/amd64
+
+# Alpine
+- label: alpine
+  base-image: alpine:3.16
+  package: apk
+  artifact-from: alpine
+
+# Debian
+- label: debian
+  base-image: debian:11-slim
+  package: deb
+  artifact-from: debian-11
+
+# RHEL
+- label: rhel
+  base-image: registry.access.redhat.com/ubi8
+  package: rpm
+  package-distro: el8
+  artifact-from: rhel-8
 
 smoke-tests:
 - label: ubuntu
+- label: debian
+- label: rhel
+- label: alpine
 
 scan-vulnerabilities:
 - label: ubuntu
+- label: debian
+- label: rhel
+- label: alpine
 
 release-packages:
+# Ubuntu
+- label: ubuntu-20.04
+  package: deb
+  artifact-from: ubuntu-20.04
+  artifact-version: 20.04
+  artifact-type: ubuntu
+  artifact: kong.amd64.deb
+- label: ubuntu-22.04
+  package: deb
+  artifact-from: ubuntu-22.04
+  artifact-version: 22.04
+  artifact-type: ubuntu
+  artifact: kong.amd64.deb
+
+# Debian
+- label: debian-11
+  package: deb
+  artifact-from: debian-11
+  artifact-version: 11
+  artifact-type: debian
+  artifact: kong.amd64.deb
+
+# RHEL
+- label: rhel-8
+  package: rpm
+  artifact-from: rhel-8
+  artifact-version: 8
+  artifact-type: rhel
+  artifact: kong.el8.amd64.rpm
+
+# Amazon Linux
+- label: amazonlinux-2023
+  package: rpm
+  artifact-from: amazonlinux-2023
+  artifact-version: 2023
+  artifact-type: amazonlinux
+  artifact: kong.aws2023.amd64.rpm
+
+# Alpine
+- label: alpine
+  package: apk
+  artifact-from: alpine
+  artifact-type: alpine
+  artifact: kong.amd64.apk.tar.gz
 
 release-images:
+- label: alpine
+  package: apk
 - label: ubuntu
-  package: deb
+- label: debian
+- label: rhel
diff --git a/.github/matrix-full.yml b/.github/matrix-full.yml
index fee7c4868a4ca..b514341ca321a 100644
--- a/.github/matrix-full.yml
+++ b/.github/matrix-full.yml
@@ -77,7 +77,7 @@ build-images:
   artifact-from: debian-11
 
 # RHEL
-- label: rhel8
+- label: rhel
   base-image: registry.access.redhat.com/ubi8
   package: rpm
   package-distro: el8
diff --git a/build/dockerfiles/rpm.Dockerfile b/build/dockerfiles/rpm.Dockerfile
index 51067e2aa7814..d3505fc9f04f0 100644
--- a/build/dockerfiles/rpm.Dockerfile
+++ b/build/dockerfiles/rpm.Dockerfile
@@ -18,7 +18,7 @@ LABEL name="Kong" \
 # RedHat required LICENSE file approved path
 COPY LICENSE /licenses/
 
-ARG PACKAGE_DISTRO=el7
+ARG PACKAGE_DISTRO=el8
 
 ARG KONG_PREFIX=/usr/local/kong
 ENV KONG_PREFIX $KONG_PREFIX