sclorg · ndavidova · May 18, 2026 · May 18, 2026 · May 18, 2026 · May 18, 2026
diff --git a/.github/workflows/container-tests.yml b/.github/workflows/container-tests.yml
@@ -4,6 +4,8 @@ on:
       - created
 
 jobs:
+  distgen-check:
+    uses: "sclorg/ci-actions/.github/workflows/distgen-check.yml@main"
   check-readme:
     uses: "sclorg/ci-actions/.github/workflows/check-readme.yml@main"
   container-tests:

diff --git a/1.20/.exclude-c9s b/1.20/.exclude-c9s
diff --git a/1.20/.exclude-fedora b/1.20/.exclude-fedora
diff --git a/1.20/.exclude-rhel8 b/1.20/.exclude-rhel8
diff --git a/1.20/Dockerfile.c9s b/1.20/Dockerfile.c9s
diff --git a/1.20/Dockerfile.fedora b/1.20/Dockerfile.fedora
diff --git a/1.20/Dockerfile.rhel8 b/1.20/Dockerfile.rhel8
@@ -39,18 +39,17 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
     NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
 
 RUN yum -y module enable nginx:$NGINX_VERSION && \
-    INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
+    INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-mod-stream nginx-mod-http-perl" && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
     yum -y clean all --enablerepo='*'
 
 # Copy the S2I scripts from the specific language image to $STI_SCRIPTS_PATH
-COPY 1.20/s2i/bin/ $STI_SCRIPTS_PATH
+COPY $NGINX_VERSION/s2i/bin/ $STI_SCRIPTS_PATH
 
 # Copy extra files to the image.
-COPY 1.20/root/ /
-
+COPY $NGINX_VERSION/root/ /
 
 # Changing ownership and user rights to support following use-cases:
 # 1) running container on OpenShift, whose default security model
@@ -86,9 +85,4 @@ USER 1001
 
 STOPSIGNAL SIGQUIT
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/usr/share/nginx/html"]
-# VOLUME ["/var/log/nginx/"]
-
 CMD $STI_SCRIPTS_PATH/usage
diff --git a/1.20/Dockerfile.rhel9 b/1.20/Dockerfile.rhel9
@@ -38,7 +38,7 @@ ENV NGINX_CONFIGURATION_PATH=${APP_ROOT}/etc/nginx.d \
     NGINX_LOG_PATH=/var/log/nginx \
     NGINX_PERL_MODULE_PATH=${APP_ROOT}/etc/perl
 
-RUN INSTALL_PKGS="nss_wrapper gettext hostname nginx nginx-all-modules" && \
+RUN INSTALL_PKGS="nss_wrapper-libs gettext hostname nginx nginx-all-modules" && \
     yum install -y --setopt=tsflags=nodocs $INSTALL_PKGS && \
     rpm -V $INSTALL_PKGS && \
     nginx -v 2>&1 | grep -qe "nginx/$NGINX_VERSION\." && echo "Found VERSION $NGINX_VERSION" && \
@@ -84,9 +84,4 @@ USER 1001
 
 STOPSIGNAL SIGQUIT
 
-# Not using VOLUME statement since it's not working in OpenShift Online:
-# https://github.com/sclorg/httpd-container/issues/30
-# VOLUME ["/usr/share/nginx/html"]
-# VOLUME ["/var/log/nginx/"]
-
 CMD $STI_SCRIPTS_PATH/usage
diff --git a/1.20/README.md b/1.20/README.md
@@ -194,15 +194,12 @@ By default, nginx access logs are written to standard output and error logs are
 
     podman logs <container>
 
-**If `NGINX_LOG_TO_VOLUME` variable is set, nginx logs into `/var/log/nginx/`.**
-
-
 See also
 --------
 Dockerfile and other sources for this container image are available on
 https://github.com/sclorg/nginx-container.
 In that repository you also can find another versions of Python environment Dockerfiles.
-Dockerfile for RHEL8 it's `Dockerfile.rhel8`,
-for RHEL9 it's `Dockerfile.rhel9`, Dockerfile for CentOS Stream 8 is called `Dockerfile.c8s`,
-Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s` and the Fedora Dockerfile is called `Dockerfile.fedora`.
+for RHEL8 it's `Dockerfile.rhel8`, Dockerfile for RHEL10 is called `Dockerfile.rhel10`,
+Dockerfile for CentOS Stream 9 is called `Dockerfile.c9s`,
+Dockerfile for CentOS Stream 10 is called `Dockerfile.c10s`, and the Fedora Dockerfile is called `Dockerfile.fedora`.
 
diff --git a/1.20/root/opt/app-root/etc/generate_container_user b/1.20/root/opt/app-root/etc/generate_container_user
diff --git a/1.20/root/opt/app-root/nginxconf-rhscl.sed b/1.20/root/opt/app-root/nginxconf-rhscl.sed
@@ -1,8 +1,8 @@
 /listen/s%80%8080 default_server%
 s/^user *nginx;//
-s%/etc/opt/rh/rh-nginx120/nginx/conf.d/%/opt/app-root/etc/nginx.d/%
-s%/etc/opt/rh/rh-nginx120/nginx/default.d/%/opt/app-root/etc/nginx.default.d/%
-s%/opt/rh/rh-nginx120/root/usr/share/nginx/html%/opt/app-root/src%
+s%/etc/nginx/conf.d/%/opt/app-root/etc/nginx.d/%
+s%/etc/nginx/default.d/%/opt/app-root/etc/nginx.default.d/%
+s%/usr/share/nginx/html%/opt/app-root/src%
 
 # See: https://github.com/sclorg/nginx-container/pull/69
 /error_page/d

diff --git a/1.20/s2i/bin/assemble b/1.20/s2i/bin/assemble
@@ -40,7 +40,7 @@ if [ -d ./nginx-start ]; then
   fi
 fi
 
-if [ -d ./nginx-perl ]; then
+if [ -n "${NGINX_PERL_MODULE_PATH}" ] && [ -d ./nginx-perl ]; then
   echo "---> Copying nginx perl module files..."
   if [ "$(ls -A ./nginx-perl/*.pm)" ]; then
     cp -av ./nginx-perl/*.pm "${NGINX_PERL_MODULE_PATH}"

diff --git a/1.20/test b/1.20/test
@@ -0,0 +1 @@
+../test
diff --git a/1.20/test/__init__.py b/1.20/test/__init__.py
diff --git a/1.20/test/conftest.py b/1.20/test/conftest.py
diff --git a/1.20/test/constants.py b/1.20/test/constants.py
diff --git a/1.20/test/examples b/1.20/test/examples
diff --git a/1.20/test/imagestreams b/1.20/test/imagestreams
diff --git a/1.20/test/run b/1.20/test/run
diff --git a/1.20/test/run-openshift-pytest b/1.20/test/run-openshift-pytest
diff --git a/1.20/test/run-openshift-remote-cluster b/1.20/test/run-openshift-remote-cluster
diff --git a/1.20/test/run-pytest b/1.20/test/run-pytest
diff --git a/1.20/test/test-app b/1.20/test/test-app
diff --git a/1.20/test/test-lib-nginx.sh b/1.20/test/test-lib-nginx.sh
diff --git a/1.20/test/test-lib-openshift.sh b/1.20/test/test-lib-openshift.sh
diff --git a/1.20/test/test-lib-remote-openshift.sh b/1.20/test/test-lib-remote-openshift.sh
diff --git a/1.20/test/test-lib.sh b/1.20/test/test-lib.sh
diff --git a/1.20/test/test-openshift.yaml b/1.20/test/test-openshift.yaml
diff --git a/1.20/test/test_container_application.py b/1.20/test/test_container_application.py
diff --git a/1.20/test/test_container_basics.py b/1.20/test/test_container_basics.py
diff --git a/1.20/test/test_container_example_apps.py b/1.20/test/test_container_example_apps.py
diff --git a/1.20/test/test_container_sizes.py b/1.20/test/test_container_sizes.py
diff --git a/1.20/test/test_ocp_imagestream_s2i.py b/1.20/test/test_ocp_imagestream_s2i.py
diff --git a/1.20/test/test_ocp_imagestreams.py b/1.20/test/test_ocp_imagestreams.py
diff --git a/1.20/test/test_ocp_local_example.py b/1.20/test/test_ocp_local_example.py
diff --git a/1.20/test/test_ocp_remote_example.py b/1.20/test/test_ocp_remote_example.py
diff --git a/1.20/test/test_ocp_shared_helm_imagestreams.py b/1.20/test/test_ocp_shared_helm_imagestreams.py
diff --git a/1.20/test/test_ocp_shared_helm_template.py b/1.20/test/test_ocp_shared_helm_template.py
diff --git a/1.20/test/test_ocp_template_example_app.py b/1.20/test/test_ocp_template_example_app.py
diff --git a/1.22-micro/.exclude-fedora b/1.22-micro/.exclude-fedora