Add Alpine 3.22 Support (#1150)

Author: aphralG

.github/workflows/ci.yml

@@ -93,10 +93,12 @@ jobs:
     strategy:
       matrix:
         container:
+        - image: "ubuntu"
+          version: "24.04"
         - image: "redhatenterprise"
           version: "9"
         - image: "alpine"
-          version: "3.19"
+          version: "3.22"
     steps:
       - uses: actions/checkout@b4ffde65f46336ab88eb53be808477a3936bae11 # v4.1.1
       - uses: actions/setup-go@0c52d547c9bc32b1aa3301fd7a9cb496313a4491 # v5.0.0

Makefile

@@ -22,12 +22,12 @@ GOBIN 	?= $$(go env GOPATH)/bin
 # | redhatenterprise | 8, 9                                  	 |                                                                |
 # | rockylinux       | 8, 9                                      |                                                                |
 # | almalinux        | 8, 9                                      |                                                                |
-# | alpine           | 3.17, 3.18, 3.19, 3.20, 3.21              |                                                                |
+# | alpine           | 3.18, 3.19, 3.20, 3.21 3.22               |                                                                |
 # | oraclelinux      | 8, 9                                		 |                                                                |
-# | suse             | sles12sp5, sle15                          |                                                                |
+# | suse             | sle15                          			 |                                                                |
 # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # # #
 OS_RELEASE  ?= ubuntu
-OS_VERSION  ?= 22.04
+OS_VERSION  ?= 24.04
 BASE_IMAGE  = "docker.io/$(OS_RELEASE):$(OS_VERSION)"
 IMAGE_TAG   = "agent_$(OS_RELEASE)_$(OS_VERSION)"
 DOCKERFILE_PATH = "./test/docker/nginx-oss/$(CONTAINER_OS_TYPE)/Dockerfile"
@@ -62,7 +62,7 @@ APK_PACKAGE := ./build/$(PACKAGE_NAME).apk
 DEB_PACKAGE := ./build/$(PACKAGE_NAME).deb
 RPM_PACKAGE := ./build/$(PACKAGE_NAME).rpm
 
-MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?=
+MOCK_MANAGEMENT_PLANE_CONFIG_DIRECTORY ?= 
 MOCK_MANAGEMENT_PLANE_LOG_LEVEL ?= INFO
 MOCK_MANAGEMENT_PLANE_GRPC_ADDRESS ?= 127.0.0.1:0
 MOCK_MANAGEMENT_PLANE_API_ADDRESS ?= 127.0.0.1:0

Makefile.packaging

@@ -14,14 +14,14 @@ TARBALL_NAME        := $(PACKAGE_PREFIX).tar.gz
 
 DEB_DISTROS         ?= ubuntu-noble-24.04 ubuntu-jammy-22.04 ubuntu-focal-20.04 debian-bookworm-12 debian-bullseye-11
 DEB_ARCHS           ?= arm64 amd64
-RPM_DISTROS         ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-12-x86_64 suse-15-x86_64
+RPM_DISTROS         ?= oraclelinux-8-x86_64 oraclelinux-9-x86_64 suse-15-x86_64
 RPM_ARCH            := x86_64
 REDHAT_VERSIONS     ?= redhatenterprise-8 redhatenterprise-9
 REDHAT_ARCHS        ?= aarch64 x86_64
 ROCKY_VERSIONS      ?= rocky-8 rocky-9
 ROCKY_ARCHS         ?= aarch64 x86_64
 FREEBSD_DISTROS     ?= "FreeBSD:13:amd64" "FreeBSD:14:amd64" 
-APK_VERSIONS        ?= 3.18 3.19 3.20 3.21
+APK_VERSIONS        ?= 3.18 3.19 3.20 3.21 3.22
 APK_ARCHS           ?= aarch64 x86_64
 APK_REVISION 		?= 1
 ALMA_VERSIONS       ?= almalinux-8 almalinux-9

scripts/packages/package-check.sh

@@ -49,6 +49,8 @@ PKG_DIR="${PKG_REPO}/${PKG_NAME}"
 PKG_REPO_URL="https://${PKG_DIR}"
 
 APK=(
+  alpine/v3.22/main/aarch64/nginx-agent-$VERSION.apk
+  alpine/v3.22/main/x86_64/nginx-agent-$VERSION.apk
   alpine/v3.21/main/aarch64/nginx-agent-$VERSION.apk
   alpine/v3.21/main/x86_64/nginx-agent-$VERSION.apk
   alpine/v3.20/main/aarch64/nginx-agent-$VERSION.apk
@@ -81,7 +83,6 @@ AMZN=(
 )
 SUSE=(
   sles/15/x86_64/RPMS/nginx-agent-$VERSION.sles15.ngx.x86_64.rpm
-  sles/12/x86_64/RPMS/nginx-agent-$VERSION.sles12.ngx.x86_64.rpm
 )
 CENTOS=(
   centos/9/aarch64/RPMS/nginx-agent-$VERSION.el9.ngx.aarch64.rpm
@@ -156,4 +157,4 @@ check_repo() {
 }
 
 check_repo
-check_pkgs
+check_pkgs

test/docker/nginx-oss/deb/Dockerfile

@@ -12,8 +12,9 @@ COPY ./build /agent/build
 COPY $ENTRY_POINT /agent/entrypoint.sh
 
 RUN set -x \
-    && addgroup --system --gid 101 nginx \
-    && adduser --system --disabled-login --ingroup nginx --no-create-home --home /nonexistent --gecos "nginx user" --shell /bin/false --uid 101 nginx \
+    && ls /usr/sbin/ \
+    && groupadd --system --gid 101 nginx \
+    && useradd --system --gid nginx --no-create-home --home /nonexistent --comment "nginx user" --shell /bin/false --uid 101 nginx \
     && apt-get update \
     && apt-get install --no-install-recommends --no-install-suggests -y ca-certificates \
                                                                         gnupg2 \