Skip to content

Use relative module path for both UBI and Alpine builds #4004

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

Merged
merged 16 commits into from
Oct 2, 2025
Merged

Use relative module path for both UBI and Alpine builds #4004

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
88b25a0
Operator-SDK skeleton (#3944)
tataruty Sep 24, 2025
e229ae1
Merge branch 'main' into feat/openshift-support
shaun-nx Sep 25, 2025
0a624fd
Add bundle, update RBAC, use root helm chart (#3961)
ciarams87 Sep 25, 2025
b0cf702
Add Dockerfiles to build images from UBI9 minimal (#3941)
shaun-nx Sep 29, 2025
0189049
Update pipeline to build and publish UBI images (#3958)
shaun-nx Oct 2, 2025
a0584eb
Operator-SDK skeleton (#3944)
tataruty Sep 24, 2025
dae978d
Add bundle, update RBAC, use root helm chart (#3961)
ciarams87 Sep 25, 2025
d2fffc9
Add Dockerfiles to build images from UBI9 minimal (#3941)
shaun-nx Sep 29, 2025
9a4d4f7
Update pipeline to build and publish UBI images (#3958)
shaun-nx Oct 2, 2025
ada0c8e
Update module dir references
shaun-nx Oct 2, 2025
4504014
Update readmes and makefiles (#3989)
ciarams87 Oct 2, 2025
58eeb65
Merge branch 'feat/openshift-support' into chore/module-dir
shaun-nx Oct 2, 2025
cc31754
Merge branch 'main' into chore/module-dir
shaun-nx Oct 2, 2025
3939b2e
Merge branch 'feat/openshift-support' into chore/module-dir
shaun-nx Oct 2, 2025
ba75cf8
Fix conflit in functional.yml
shaun-nx Oct 2, 2025
a65cba6
Merge branch 'feat/openshift-support' into chore/module-dir
shaun-nx Oct 2, 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: 3 additions & 4 deletions build/ubi/Dockerfile.nginx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,18 +48,17 @@ RUN --mount=type=bind,from=nginx-files,src=nginx_signing.key,target=/tmp/nginx_s
&& rm -rf /var/cache/yum

# Configure directories and logging
RUN mkdir -p /usr/lib/nginx/modules /var/run/nginx /usr/lib64/nginx/modules \
RUN mkdir -p /var/run/nginx /usr/lib64/nginx/modules \
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why not to make /usr/lib64/nginx/modules env variable?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't quite understand.
If we set /usr/lib64/nginx/modules as an env variable (e.g. export LIB_DIR=/usr/lib64/nginx/modules ) does that mean we can avoid making the directory?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

no, just having it to edit in one place

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't think it should be an ENV var because then it's technically over writable at build time which is not what we want here. It's correct to be explicit here - and anyway it's only specified in the file twice.

# Forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
&& cp /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/
&& ln -sf /dev/stderr /var/log/nginx/error.log

# Set proper permissions for nginx user
RUN chown -R 101:1001 /etc/nginx /var/cache/nginx

# Copy configuration files and scripts
COPY build/entrypoint.sh /agent/entrypoint.sh
COPY ${NJS_DIR}/ /usr/lib/nginx/modules/njs/
COPY ${NJS_DIR}/ /usr/lib64/nginx/modules/njs/
COPY ${NGINX_CONF_DIR}/nginx.conf /etc/nginx/nginx.conf
COPY ${NGINX_CONF_DIR}/grpc-error-locations.conf /etc/nginx/grpc-error-locations.conf
COPY ${NGINX_CONF_DIR}/grpc-error-pages.conf /etc/nginx/grpc-error-pages.conf
Expand Down
14 changes: 6 additions & 8 deletions build/ubi/Dockerfile.nginxplus
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,8 +36,8 @@ RUN --mount=type=bind,from=nginx-files,src=nginx-plus.repo,target=/etc/yum.repos
--mount=type=bind,from=ubi9-packages,src=/,target=/ubi-bin/ \
--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
microdnf --nodocs install -y shadow-utils subscription-manager \
# Install shadow-utils for useradd
microdnf --nodocs install -y shadow-utils \
&& rpm --import /tmp/nginx_signing.key \
# Install c-ares from the dependencies image (contains required libs)
&& rpm -Uvh /ubi-bin/c-ares-*.rpm \
Expand All @@ -50,17 +50,15 @@ RUN --mount=type=bind,from=nginx-files,src=nginx-plus.repo,target=/etc/yum.repos
# Install nginx-agent
&& microdnf --nodocs install -y nginx-agent-${NGINX_AGENT_VERSION#v}* \
# Clean up
&& microdnf remove -y shadow-utils subscription-manager \
&& microdnf remove -y shadow-utils \
&& microdnf clean all \
&& rm -rf /var/cache/yum

# Configure directories and logging
RUN mkdir -p /usr/lib/nginx/modules /var/run/nginx /usr/lib64/nginx/modules \
RUN mkdir -p /var/run/nginx /usr/lib64/nginx/modules \
# Forward request and error logs to docker log collector
&& ln -sf /dev/stdout /var/log/nginx/access.log \
&& ln -sf /dev/stderr /var/log/nginx/error.log \
&& cp /usr/lib64/nginx/modules/ngx_* /usr/lib/nginx/modules/

&& ln -sf /dev/stderr /var/log/nginx/error.log
# Copy default html files to a writable location
RUN mkdir -p /etc/nginx/html \
&& cp /usr/share/nginx/html/* /etc/nginx/html/
Expand All @@ -70,7 +68,7 @@ RUN chown -R 101:1001 /etc/nginx /var/cache/nginx

# Copy configuration files and scripts
COPY build/entrypoint.sh /agent/entrypoint.sh
COPY ${NJS_DIR}/ /usr/lib/nginx/modules/njs/
COPY ${NJS_DIR}/ /usr/lib64/nginx/modules/njs/
COPY ${NGINX_CONF_DIR}/nginx.conf /etc/nginx/nginx.conf
COPY ${NGINX_CONF_DIR}/grpc-error-locations.conf /etc/nginx/grpc-error-locations.conf
COPY ${NGINX_CONF_DIR}/grpc-error-pages.conf /etc/nginx/grpc-error-pages.conf
Expand Down
2 changes: 1 addition & 1 deletion examples/http-request-header-filter/headers.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ data:
pid /var/run/nginx.pid;
load_module /usr/lib/nginx/modules/ngx_http_js_module.so;
load_module modules/ngx_http_js_module.so;
events {}
Expand Down
4 changes: 2 additions & 2 deletions internal/controller/nginx/conf/nginx-plus.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load_module /usr/lib/nginx/modules/ngx_http_js_module.so;
load_module modules/ngx_http_js_module.so;
include /etc/nginx/main-includes/*.conf;

worker_processes auto;
Expand All @@ -12,7 +12,7 @@ events {
http {
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/mime.types;
js_import /usr/lib/nginx/modules/njs/httpmatches.js;
js_import modules/njs/httpmatches.js;

default_type application/octet-stream;

Expand Down
4 changes: 2 additions & 2 deletions internal/controller/nginx/conf/nginx.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
load_module /usr/lib/nginx/modules/ngx_http_js_module.so;
load_module modules/ngx_http_js_module.so;
include /etc/nginx/main-includes/*.conf;

worker_processes auto;
Expand All @@ -12,7 +12,7 @@ events {
http {
include /etc/nginx/conf.d/*.conf;
include /etc/nginx/mime.types;
js_import /usr/lib/nginx/modules/njs/httpmatches.js;
js_import modules/njs/httpmatches.js;

default_type application/octet-stream;

Expand Down
Loading