Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove unused repo from UBI base image #7311

Merged
merged 7 commits into from
Feb 10, 2025
Merged

remove unused repo from UBI base image #7311

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
3cf6990
remove codeready-builder repo
pdabelf5 Feb 6, 2025
2079f1f
add rhel license to build
pdabelf5 Feb 6, 2025
09a49de
ensure nginx directory exists
pdabelf5 Feb 6, 2025
f9cbaf4
remove code ready builder repo
pdabelf5 Feb 6, 2025
60c440f
remove &&
pdabelf5 Feb 6, 2025
78396ff
Merge branch 'main' into ubi-nginx-build
pdabelf5 Feb 6, 2025
2731290
Merge branch 'main' into ubi-nginx-build
jjngx Feb 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 2 additions & 5 deletions build/dependencies/Dockerfile.ubi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,10 +4,8 @@ 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}


ENV NGINX_VERSION=${NGINX}
ENV NJS_VERSION=${NJS}
RUN mkdir -p /nginx/; \
# only build for ppc64le but make multiarch image for mounting
[ $(uname -p) = x86_64 ] && exit 0; \
Expand All @@ -26,7 +24,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 \
Expand Down
Loading