From 3cf69908f229a85739979d0ef01ee286659ac2ea Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 6 Feb 2025 12:59:32 +0000 Subject: [PATCH 1/4] remove codeready-builder repo --- build/dependencies/Dockerfile.ubi | 1 - 1 file changed, 1 deletion(-) diff --git a/build/dependencies/Dockerfile.ubi b/build/dependencies/Dockerfile.ubi index d537f86f67..f8c6c115eb 100644 --- a/build/dependencies/Dockerfile.ubi +++ b/build/dependencies/Dockerfile.ubi @@ -26,7 +26,6 @@ RUN mkdir -p /nginx/; \ nginx-module-image-filter-${NGINX_VERSION} \ nginx-module-njs-${NGINX_VERSION}+${NJS_VERSION} \ " \ - && dnf config-manager --set-enabled ubi-9-codeready-builder \ && dnf download --source ${nginxPackages} \ && dnf builddep -y --srpm nginx*.rpm \ && rpmbuild --rebuild --nodebuginfo nginx*.rpm \ From 2079f1f79ca047f3ff4e253553fa558b83e743df Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 6 Feb 2025 13:25:06 +0000 Subject: [PATCH 2/4] add rhel license to build --- .github/workflows/build-ubi-dependency.yml | 2 ++ build/dependencies/Dockerfile.ubi | 12 ++++++------ 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/.github/workflows/build-ubi-dependency.yml b/.github/workflows/build-ubi-dependency.yml index c45ac9b03f..6055843f55 100644 --- a/.github/workflows/build-ubi-dependency.yml +++ b/.github/workflows/build-ubi-dependency.yml @@ -138,3 +138,5 @@ jobs: build-args: | NGINX=${{ needs.checks.outputs.nginx_version }} NJS=${{ needs.checks.outputs.njs_version }} + secrets: | + ${{ format('"rhel_license={0}"', secrets.RHEL_LICENSE) }} diff --git a/build/dependencies/Dockerfile.ubi b/build/dependencies/Dockerfile.ubi index f8c6c115eb..de14414049 100644 --- a/build/dependencies/Dockerfile.ubi +++ b/build/dependencies/Dockerfile.ubi @@ -4,15 +4,14 @@ FROM nginx:1.27.4@sha256:91734281c0ebfc6f1aea979cffeed5079cfe786228a71cc6f1f46a2 FROM redhat/ubi9:9.5@sha256:be214e191bbe3f4d0f16a5a4f5642e1f32fccd6fae7d2b6c6acb066ba51fb507 AS rpm-build ARG NGINX ARG NJS -ENV NGINX_VERSION ${NGINX} -ENV NJS_VERSION ${NJS} - - -RUN mkdir -p /nginx/; \ +ENV NGINX_VERSION=${NGINX} +ENV NJS_VERSION=${NJS} +RUN --mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 source /tmp/rhel_license; \ # only build for ppc64le but make multiarch image for mounting [ $(uname -p) = x86_64 ] && exit 0; \ [ $(uname -p) = aarch64 ] && exit 0; \ - rpm --import https://nginx.org/keys/nginx_signing.key \ + mkdir -p /nginx/ \ + && rpm --import https://nginx.org/keys/nginx_signing.key \ && MINOR_VERSION=$(echo ${NGINX_VERSION} | cut -d '.' -f 2) \ && if [ $(( $MINOR_VERSION % 2)) -eq 0 ]; then echo mainline=""; else mainline="mainline/"; fi \ && printf "%s\n" "[nginx]" "name=nginx src repo" \ @@ -26,6 +25,7 @@ RUN mkdir -p /nginx/; \ nginx-module-image-filter-${NGINX_VERSION} \ nginx-module-njs-${NGINX_VERSION}+${NJS_VERSION} \ " \ + && dnf config-manager --set-enabled ubi-9-codeready-builder \ && dnf download --source ${nginxPackages} \ && dnf builddep -y --srpm nginx*.rpm \ && rpmbuild --rebuild --nodebuginfo nginx*.rpm \ From 09a49de4415b573215e60de222aec00219877af1 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 6 Feb 2025 13:31:35 +0000 Subject: [PATCH 3/4] ensure nginx directory exists --- build/dependencies/Dockerfile.ubi | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build/dependencies/Dockerfile.ubi b/build/dependencies/Dockerfile.ubi index de14414049..26fff4cb80 100644 --- a/build/dependencies/Dockerfile.ubi +++ b/build/dependencies/Dockerfile.ubi @@ -6,11 +6,11 @@ ARG NGINX ARG NJS ENV NGINX_VERSION=${NGINX} ENV NJS_VERSION=${NJS} -RUN --mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 source /tmp/rhel_license; \ +RUN --mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 mkdir -p /nginx/; \ # only build for ppc64le but make multiarch image for mounting [ $(uname -p) = x86_64 ] && exit 0; \ [ $(uname -p) = aarch64 ] && exit 0; \ - mkdir -p /nginx/ \ + source /tmp/rhel_license \ && rpm --import https://nginx.org/keys/nginx_signing.key \ && MINOR_VERSION=$(echo ${NGINX_VERSION} | cut -d '.' -f 2) \ && if [ $(( $MINOR_VERSION % 2)) -eq 0 ]; then echo mainline=""; else mainline="mainline/"; fi \ From f9cbaf48ded7e38d0449988e9428f4b66ad8ec46 Mon Sep 17 00:00:00 2001 From: Paul Abel Date: Thu, 6 Feb 2025 14:04:10 +0000 Subject: [PATCH 4/4] remove code ready builder repo --- .github/workflows/build-ubi-dependency.yml | 2 -- build/dependencies/Dockerfile.ubi | 4 +--- 2 files changed, 1 insertion(+), 5 deletions(-) diff --git a/.github/workflows/build-ubi-dependency.yml b/.github/workflows/build-ubi-dependency.yml index 6055843f55..c45ac9b03f 100644 --- a/.github/workflows/build-ubi-dependency.yml +++ b/.github/workflows/build-ubi-dependency.yml @@ -138,5 +138,3 @@ jobs: build-args: | NGINX=${{ needs.checks.outputs.nginx_version }} NJS=${{ needs.checks.outputs.njs_version }} - secrets: | - ${{ format('"rhel_license={0}"', secrets.RHEL_LICENSE) }} diff --git a/build/dependencies/Dockerfile.ubi b/build/dependencies/Dockerfile.ubi index 26fff4cb80..92b496e8d8 100644 --- a/build/dependencies/Dockerfile.ubi +++ b/build/dependencies/Dockerfile.ubi @@ -6,11 +6,10 @@ ARG NGINX ARG NJS ENV NGINX_VERSION=${NGINX} ENV NJS_VERSION=${NJS} -RUN --mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 mkdir -p /nginx/; \ +RUN mkdir -p /nginx/; \ # only build for ppc64le but make multiarch image for mounting [ $(uname -p) = x86_64 ] && exit 0; \ [ $(uname -p) = aarch64 ] && exit 0; \ - source /tmp/rhel_license \ && rpm --import https://nginx.org/keys/nginx_signing.key \ && MINOR_VERSION=$(echo ${NGINX_VERSION} | cut -d '.' -f 2) \ && if [ $(( $MINOR_VERSION % 2)) -eq 0 ]; then echo mainline=""; else mainline="mainline/"; fi \ @@ -25,7 +24,6 @@ RUN --mount=type=secret,id=rhel_license,dst=/tmp/rhel_license,mode=0644 mkdir -p nginx-module-image-filter-${NGINX_VERSION} \ nginx-module-njs-${NGINX_VERSION}+${NJS_VERSION} \ " \ - && dnf config-manager --set-enabled ubi-9-codeready-builder \ && dnf download --source ${nginxPackages} \ && dnf builddep -y --srpm nginx*.rpm \ && rpmbuild --rebuild --nodebuginfo nginx*.rpm \