Onboard to distgen generated sources by ndavidova · Pull Request #381 · sclorg/nginx-container

ndavidova · 2026-06-01T10:29:23Z

No description provided.

Use Jinja2 conditional to handle empty environment_setup properly. When environment_setup is empty (Fedora, C10S, RHEL10), generate 'RUN INSTALL_PKGS=...' instead of 'RUN \n INSTALL_PKGS=...' which caused build failures.

Changed from 'CMD $STI_SCRIPTS_PATH/usage' to 'CMD ["/usr/libexec/s2i/usage"]' to follow Docker best practices and prevent build warnings from breaking image ID extraction in build scripts.

coderabbitai · 2026-06-01T10:29:30Z

Important

Review skipped

Too many files!

This PR contains 187 files, which is 37 over the limit of 150.

To get a review, narrow the scope:
• coderabbit review --type committed # exclude uncommitted changes
• coderabbit review --dir # limit to a subdirectory
• coderabbit review --base # compare against a closer base

⚙️ Run configuration

Configuration used: defaults

Review profile: CHILL

Plan: Pro

Run ID: 25e262dd-8c4e-4482-b61e-fa76dc301914

📥 Commits

Reviewing files that changed from the base of the PR and between 8b6fd55 and c49fde8.

📒 Files selected for processing (187)

.github/workflows/container-tests.yml
1.20/.exclude-c9s
1.20/.exclude-fedora
1.20/.exclude-rhel8
1.20/Dockerfile.c9s
1.20/Dockerfile.fedora
1.20/Dockerfile.rhel8
1.20/Dockerfile.rhel9
1.20/README.md
1.20/root/opt/app-root/etc/generate_container_user
1.20/root/opt/app-root/nginxconf-rhscl.sed
1.20/s2i/bin/assemble
1.20/test
1.20/test/__init__.py
1.20/test/conftest.py
1.20/test/constants.py
1.20/test/examples
1.20/test/imagestreams
1.20/test/run
1.20/test/run-openshift-pytest
1.20/test/run-openshift-remote-cluster
1.20/test/run-pytest
1.20/test/test-app
1.20/test/test-lib-nginx.sh
1.20/test/test-lib-openshift.sh
1.20/test/test-lib-remote-openshift.sh
1.20/test/test-lib.sh
1.20/test/test-openshift.yaml
1.20/test/test_container_application.py
1.20/test/test_container_basics.py
1.20/test/test_container_example_apps.py
1.20/test/test_container_sizes.py
1.20/test/test_ocp_imagestream_s2i.py
1.20/test/test_ocp_imagestreams.py
1.20/test/test_ocp_local_example.py
1.20/test/test_ocp_remote_example.py
1.20/test/test_ocp_shared_helm_imagestreams.py
1.20/test/test_ocp_shared_helm_template.py
1.20/test/test_ocp_template_example_app.py
1.22-micro/.exclude-fedora
1.22-micro/Dockerfile.c9s
1.22-micro/README.md
1.22-micro/core-scripts
1.22-micro/root
1.22-micro/s2i
1.22-micro/test
1.22/.exclude-c9s
1.22/.exclude-fedora
1.22/Dockerfile.c9s
1.22/Dockerfile.fedora
1.22/Dockerfile.rhel8
1.22/Dockerfile.rhel9
1.22/README.md
1.22/root/opt/app-root/etc/generate_container_user
1.22/test
1.22/test/__init__.py
1.22/test/conftest.py
1.22/test/examples
1.22/test/imagestreams
1.22/test/perl-test-app/index.html
1.22/test/perl-test-app/nginx-perl/Version.pm
1.22/test/perl-test-app/nginx.conf
1.22/test/run
1.22/test/run-openshift-pytest
1.22/test/run-openshift-remote-cluster
1.22/test/run-pytest
1.22/test/start-hook-test-app/index.html
1.22/test/start-hook-test-app/index2.html
1.22/test/start-hook-test-app/nginx-cfg/default.conf
1.22/test/start-hook-test-app/nginx-start/init.sh
1.22/test/test-app
1.22/test/test-lib-nginx.sh
1.22/test/test-lib-openshift.sh
1.22/test/test-lib-remote-openshift.sh
1.22/test/test-lib.sh
1.22/test/test-openshift.yaml
1.22/test/test_container_application.py
1.22/test/test_container_basics.py
1.22/test/test_container_example_apps.py
1.22/test/test_container_sizes.py
1.22/test/test_ocp_imagestream_s2i.py
1.22/test/test_ocp_imagestreams.py
1.22/test/test_ocp_local_example.py
1.22/test/test_ocp_remote_example.py
1.22/test/test_ocp_shared_helm_imagestreams.py
1.22/test/test_ocp_shared_helm_template.py
1.22/test/test_ocp_template_example_app.py
1.24/.exclude-c8s
1.24/.exclude-fedora
1.24/Dockerfile.c9s
1.24/Dockerfile.rhel8
1.24/README.md
1.24/root/opt/app-root/etc/generate_container_user
1.24/test
1.24/test/__init__.py
1.24/test/conftest.py
1.24/test/constants.py
1.24/test/examples
1.24/test/imagestreams
1.24/test/perl-test-app/index.html
1.24/test/perl-test-app/nginx-perl/Version.pm
1.24/test/perl-test-app/nginx.conf
1.24/test/run
1.24/test/run-openshift-pytest
1.24/test/run-openshift-remote-cluster
1.24/test/run-pytest
1.24/test/start-hook-test-app/index.html
1.24/test/start-hook-test-app/index2.html
1.24/test/start-hook-test-app/nginx-cfg/default.conf
1.24/test/start-hook-test-app/nginx-start/init.sh
1.24/test/test-app
1.24/test/test-lib.sh
1.24/test/test_container_application.py
1.24/test/test_container_basics.py
1.24/test/test_container_example_apps.py
1.24/test/test_container_sizes.py
1.24/test/test_ocp_imagestream_s2i.py
1.24/test/test_ocp_imagestreams.py
1.24/test/test_ocp_local_example.py
1.24/test/test_ocp_remote_example.py
1.24/test/test_ocp_shared_helm_imagestreams.py
1.24/test/test_ocp_shared_helm_template.py
1.24/test/test_ocp_template_example_app.py
1.26/.exclude-rhel8
1.26/Dockerfile.c10s
1.26/Dockerfile.c9s
1.26/Dockerfile.fedora
1.26/Dockerfile.rhel10
1.26/Dockerfile.rhel8
1.26/root/opt/app-root/etc/generate_container_user
1.26/test
1.26/test/__init__.py
1.26/test/conftest.py
1.26/test/examples
1.26/test/imagestreams
1.26/test/perl-test-app/index.html
1.26/test/perl-test-app/nginx-perl/Version.pm
1.26/test/perl-test-app/nginx.conf
1.26/test/run
1.26/test/run-openshift-remote-cluster
1.26/test/run-pytest
1.26/test/start-hook-test-app/index.html
1.26/test/start-hook-test-app/index2.html
1.26/test/start-hook-test-app/nginx-cfg/default.conf
1.26/test/start-hook-test-app/nginx-start/init.sh
1.26/test/test-app
1.26/test/test-lib-nginx.sh
1.26/test/test-lib-openshift.sh
1.26/test/test-lib-remote-openshift.sh
1.26/test/test-lib.sh
1.26/test/test-openshift.yaml
1.26/test/test_container_application.py
1.26/test/test_container_basics.py
1.26/test/test_container_example_apps.py
1.26/test/test_container_sizes.py
1.26/test/test_ocp_imagestream_s2i.py
1.26/test/test_ocp_imagestreams.py
1.26/test/test_ocp_local_example.py
1.26/test/test_ocp_remote_example.py
1.26/test/test_ocp_shared_helm_imagestreams.py
1.26/test/test_ocp_shared_helm_template.py
1.26/test/test_ocp_template_example_app.py
Makefile
README.md
manifest-micro.yml
manifest.yml
specs/multispec.yml
src/Dockerfile
src/Dockerfile.fedora
src/Dockerfile.micro
src/README.md
src/root/opt/app-root/etc/generate_container_user
src/root/opt/app-root/etc/passwd.template
src/root/opt/app-root/nginxconf-rhscl.sed
src/root/opt/app-root/nginxconf.sed
src/root/usr/share/container-scripts/nginx/common.sh
src/s2i/bin/assemble
src/s2i/bin/run
src/s2i/bin/usage
test/perl-test-app/index.html
test/perl-test-app/nginx-perl/Version.pm
test/perl-test-app/nginx.conf
test/start-hook-test-app/index.html
test/start-hook-test-app/index2.html
test/start-hook-test-app/nginx-cfg/default.conf
test/start-hook-test-app/nginx-start/init.sh
test/test-app

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

🔍 Trigger review

✨ Finishing Touches

🧪 Generate unit tests (beta)

Create PR with unit tests
Commit unit tests in branch ndavidov/distgen

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

_{Comment @coderabbitai help to get the list of available commands and usage tips.}

github-actions · 2026-06-01T10:29:49Z

Pull Request validation

Failed

🔴 Failed or pending statuses:

Testing Farm - RHEL9 - 1.20[error]
Testing Farm - RHEL9 - 1.26[error]
Testing Farm - CentOS Stream 9 - 1.26[error]
Testing Farm - RHEL10 - Unsubscribed host - 1.26[error]
Testing Farm - RHEL9 - 1.22[error]
Testing Farm - RHEL9 - 1.24[error]
Testing Farm - RHEL9 - Unsubscribed host - 1.26[error]
Testing Farm - RHEL8 - 1.22[error]
Testing Farm - RHEL8 - 1.24[error]
Testing Farm - RHEL9 - Unsubscribed host - 1.20[error]
Testing Farm - CentOS Stream 10 - 1.26[error]
Testing Farm - Fedora - 1.26[error]
Testing Farm - CentOS Stream 9 - 1.22-micro[error]
Testing Farm - RHEL8 - 1.20[error]
Testing Farm - RHEL10 - 1.26[error]
Testing Farm - RHEL9 - Unsubscribed host - 1.22[error]
Testing Farm - RHEL8 - 1.22-micro[error]
Testing Farm - CentOS Stream 9 - 1.24[error]
Testing Farm - RHEL9 - Unsubscribed host - 1.24[error]

🔴 Approval - missing or changes were requested

Success

🟢 Review - Reviewed by a member

Triggered by Workflow Run

ndavidova · 2026-06-01T10:30:01Z

[test]

github-actions · 2026-06-01T10:47:04Z

Testing Farm results

name	compose	arch	status	started (UTC)	time	logs
Fedora - 1.26	Fedora-latest	x86_64	✅ passed	09.06.2026 10:35:11	6min 34s	test pipeline
CentOS Stream 9 - 1.24	CentOS-Stream-9	x86_64	❌ error	01.06.2026 10:30:49	16min 60s	test pipeline
CentOS Stream 9 - 1.22-micro	CentOS-Stream-9	x86_64	✅ passed	01.06.2026 10:30:48	18min 41s	test pipeline
RHEL8 - 1.22-micro	RHEL-8.10.0-Nightly	x86_64	❌ error	01.06.2026 10:30:48	19min 38s	test pipeline
RHEL8 - 1.22	RHEL-8.10.0-Nightly	x86_64	❌ error	01.06.2026 10:30:48	19min 44s	test pipeline
RHEL8 - 1.24	RHEL-8.10.0-Nightly	x86_64	❌ error	01.06.2026 10:30:49	20min 49s	test pipeline
RHEL10 - Unsubscribed host - 1.26	RHEL-10.2-Nightly	x86_64	✅ passed	01.06.2026 10:30:48	26min 39s	test pipeline
CentOS Stream 10 - 1.26	CentOS-Stream-10	x86_64	✅ passed	01.06.2026 10:49:28	9min 51s	test pipeline
RHEL9 - Unsubscribed host - 1.20	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:30:48	29min 29s	test pipeline
RHEL9 - Unsubscribed host - 1.22	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:30:50	29min 26s	test pipeline
RHEL9 - 1.20	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:30:48	30min 10s	test pipeline
RHEL9 - 1.22	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:30:48	32min 23s	test pipeline
RHEL9 - Unsubscribed host - 1.24	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:30:48	35min 17s	test pipeline
RHEL10 - 1.26	RHEL-10.2-Nightly	x86_64	✅ passed	01.06.2026 10:53:16	15min 60s	test pipeline
RHEL8 - 1.20	RHEL-8.10.0-Nightly	x86_64	✅ passed	01.06.2026 10:59:13	11min 48s	test pipeline
RHEL9 - Unsubscribed host - 1.26	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:51:20	18min 6s	test pipeline
RHEL9 - 1.26	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:51:15	20min 10s	test pipeline
RHEL9 - 1.24	RHEL-9.8.0-Nightly	x86_64	✅ passed	01.06.2026 10:51:12	20min 46s	test pipeline

phracek · 2026-06-08T12:46:59Z

@coderabbitai review

coderabbitai · 2026-06-08T12:47:06Z

✅ Action performed

Review finished.

Note: CodeRabbit is an incremental review system and does not re-review already reviewed commits. This command is applicable only when automatic reviews are paused.

phracek

Thanks for this pull request. Great.

There is inverted logic.
See here: https://github.com/sclorg/postgresql-container/blob/master/manifest.yml#L47

phracek · 2026-06-23T08:05:58Z

+# This section is the last one on purpose because the generator.py
+# does not allow dead symlinks.
+SYMLINK_RULES:
+  - src: ../1.22/root


This should opposite.

Inverted logic :)

phracek · 2026-06-23T08:06:25Z

+      io.openshift.tags="builder,${NAME},${NAME}-${NGINX_SHORT_VER}" \
+      com.redhat.component="${NAME}-${NGINX_SHORT_VER}-container" \
+      name="{{ spec.org }}/${NAME}-${NGINX_SHORT_VER}-micro" \
+{% if spec.prod in ["rhel8", "rhel9", "c8s", "c9s"] %}


This is not need at all. Please delete it.

phracek · 2026-06-23T08:07:53Z

+FROM {{ spec.micro_build_base }} AS build

 RUN mkdir -p /mnt/rootfs
+{% if spec.prod == "rhel8" %}


Can we somehow make it more readable.

What about to add to multispec.yml more specification and use it there

phracek · 2026-06-23T08:08:32Z

-    INSTALL_PKGS="$MICRO_PKGS nginx-core findutils hostname nss_wrapper-libs gettext " && \
-    dnf install --installroot /mnt/rootfs $INSTALL_PKGS --releasever 36 --setopt install_weak_deps=false --nodocs -y && \
+    INSTALL_PKGS="$MICRO_PKGS {{ spec.micro_pkgs }} " && \
+    dnf --installroot /mnt/rootfs --releasever {{ spec.micro_releasever }} --setopt install_weak_deps=false --nodocs module enable nginx:{{ spec.version }} -y && \


This is repeating. Let's make it easier. More it to multispec.yml

frenzymadness · 2026-06-25T18:30:04Z

+
+Usage in OpenShift
+------------------
+In this example, we assume that you are using the `ubi9/nginx-{{ spec.short }}` image, available through the `nginx:{{ spec.version }}` imagestream tag in Openshift.


This file has hardcoded ubi9 multiple times.

ndavidova added 13 commits May 18, 2026 17:04

Add dist-gen source files and infrastructure

0d13859

Regenerate version directories using dist-gen

423bd2d

Update README with contributing guidelines for dist-gen

ba2da2d

Remove CentOS Stream 8 support (EOL)

f0660b5

regenerate version table

3e9c492

Fix empty RUN command in Dockerfile template

28b87ba

Use Jinja2 conditional to handle empty environment_setup properly. When environment_setup is empty (Fedora, C10S, RHEL10), generate 'RUN INSTALL_PKGS=...' instead of 'RUN \n INSTALL_PKGS=...' which caused build failures.

Use JSON array format for CMD to suppress Docker warning

2adbe56

Changed from 'CMD $STI_SCRIPTS_PATH/usage' to 'CMD ["/usr/libexec/s2i/usage"]' to follow Docker best practices and prevent build warnings from breaking image ID extraction in build scripts.

Fix distgen templates to preserve original Dockerfile format

3a6fead

Remove excluded combinations from multispec

32088db

Remove version 1.20 for RHEL9

cd4e298

Change packages for rhel8

cbd4648

add distgen check to github workflow

f7f2bde

resolve rhel 9 1.20 combination

0eb40cf

github-actions Bot added pr/failing-ci pr/missing-review labels Jun 1, 2026

phracek requested a review from pkhartsk June 1, 2026 12:07

phracek added the ready for review label Jun 1, 2026

add distgen for micro

c49fde8

github-actions Bot removed the pr/failing-ci label Jun 9, 2026

ndavidova mentioned this pull request Jun 9, 2026

Add distgen check to GitHub workflow #382

Merged

2 tasks

github-actions Bot added the pr/failing-ci label Jun 9, 2026

ndavidova marked this pull request as ready for review June 17, 2026 10:25

phracek requested changes Jun 23, 2026

View reviewed changes

frenzymadness reviewed Jun 25, 2026

View reviewed changes

github-actions Bot added pr/changes-requested and removed pr/missing-review labels Jul 1, 2026

Uh oh!

Conversation

ndavidova commented Jun 1, 2026 • edited by github-actions Bot Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

coderabbitai Bot commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Review skipped

Uh oh!

github-actions Bot commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Pull Request validation

Failed

Success

Uh oh!

ndavidova commented Jun 1, 2026

Uh oh!

github-actions Bot commented Jun 1, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Testing Farm results

Uh oh!

phracek commented Jun 8, 2026

Uh oh!

coderabbitai Bot commented Jun 8, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

phracek left a comment

Choose a reason for hiding this comment

Uh oh!

phracek Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

phracek Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

phracek Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

phracek Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

phracek Jun 23, 2026

Choose a reason for hiding this comment

Uh oh!

frenzymadness Jun 25, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ndavidova commented Jun 1, 2026 •

edited by github-actions Bot

Loading

coderabbitai Bot commented Jun 1, 2026 •

edited

Loading

github-actions Bot commented Jun 1, 2026 •

edited

Loading

github-actions Bot commented Jun 1, 2026 •

edited

Loading

coderabbitai Bot commented Jun 8, 2026 •

edited

Loading