Merge branch 'feat/pipeline-ubi-builds' into feat/pipeline-openshift-operator

Author: shaun-nx

build/ubi/Dockerfile.nginx

@@ -8,7 +8,7 @@ ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
 
 FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:01a32246761b9bbe47a6a29bcd8ca6e9b6e331b3bdfa372d8987b622276f7025 AS ubi9-packages
 
-FROM redhat/ubi9:9.6 AS ubi-nginx
+FROM redhat/ubi9-minimal:9.6 AS ubi-nginx
 
 # renovate: datasource=github-tags depName=nginx/agent
 ARG NGINX_AGENT_VERSION=v3.3.1
@@ -36,15 +36,17 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
     rpm --import /tmp/nginx_signing.key \
     # Install c-ares from the dependencies image (contains required libs)
     && rpm -Uvh /ubi-bin/c-ares-*.rpm \
+    && microdnf --nodocs install -y pcre pcre2  \
+    && microdnf --nodocs install -y procps-ng iproute iputils which \
     # Create nginx user with consistent UID/GID
     && groupadd -g 1001 nginx \
     && useradd -r -u 101 -g nginx -s /sbin/nologin -d /var/cache/nginx nginx \
     # Install NGINX and modules including OTEL
-    && dnf --nodocs install -y nginx nginx-module-njs nginx-module-otel \
+    && microdnf --nodocs install -y nginx nginx-module-njs nginx-module-otel \
     # Install nginx-agent
-    && dnf --nodocs install -y nginx-agent-${NGINX_AGENT_VERSION#v}* \
+    && microdnf --nodocs install -y nginx-agent-${NGINX_AGENT_VERSION#v}* \
     # Clean up (only remove what we can)
-    && dnf clean all \
+    && microdnf clean all \
     && rm -rf /var/cache/yum
 
 # Configure directories and logging

build/ubi/Dockerfile.nginxplus

@@ -8,7 +8,7 @@ ADD --link --chown=101:1001 build/ubi/repos/agent.repo agent.repo
 
 FROM ghcr.io/nginx/dependencies/nginx-ubi:ubi9@sha256:01a32246761b9bbe47a6a29bcd8ca6e9b6e331b3bdfa372d8987b622276f7025 AS ubi9-packages
 
-FROM redhat/ubi9:9.6 AS ubi-nginx-plus
+FROM redhat/ubi9-minimal:9.6 AS ubi-nginx-plus
 
 ARG NGINX_PLUS_VERSION=R35
 
@@ -37,21 +37,23 @@ RUN --mount=type=bind,from=nginx-files,src=nginx-plus.repo,target=/etc/yum.repos
     --mount=type=secret,id=nginx-repo.crt,dst=/etc/ssl/nginx/nginx-repo.crt,mode=0644 \
 	--mount=type=secret,id=nginx-repo.key,dst=/etc/ssl/nginx/nginx-repo.key,mode=0644 \
     # Install shadow-utils for useradd and subscription-manager for repo access
-    dnf --nodocs install -y shadow-utils subscription-manager \
+    microdnf --nodocs install -y shadow-utils subscription-manager \
+    && microdnf --nodocs install -y pcre pcre2  \
+    && microdnf --nodocs install -y procps-ng iproute iputils which \
     && rpm --import /tmp/nginx_signing.key \
     # Install c-ares from the dependencies image (contains required libs)
     && rpm -Uvh /ubi-bin/c-ares-*.rpm \
     # Create nginx user with consistent UID/GID
     && groupadd -g 1001 nginx \
     && useradd -r -u 101 -g nginx -s /sbin/nologin -d /var/cache/nginx nginx \
     # Install NGINX Plus and modules (njs, otel)
-    && dnf --nodocs install -y nginx-plus-${NGINX_PLUS_VERSION,,} \
-    && dnf --nodocs install -y nginx-plus-module-njs-${NGINX_PLUS_VERSION,,} nginx-plus-module-otel-${NGINX_PLUS_VERSION,,} \
+    && microdnf --nodocs install -y nginx-plus-${NGINX_PLUS_VERSION,,} \
+    && microdnf --nodocs install -y nginx-plus-module-njs-${NGINX_PLUS_VERSION,,} nginx-plus-module-otel-${NGINX_PLUS_VERSION,,} \
     # Install nginx-agent
-    && dnf --nodocs install -y nginx-agent-${NGINX_AGENT_VERSION#v}* \
+    && microdnf --nodocs install -y nginx-agent-${NGINX_AGENT_VERSION#v}* \
     # Clean up
-    && dnf remove -y shadow-utils subscription-manager \
-    && dnf clean all \
+    && microdnf remove -y shadow-utils subscription-manager \
+    && microdnf clean all \
     && rm -rf /var/cache/yum
 
 # Configure directories and logging