sclorg · ndavidova · May 25, 2026 · Jun 9, 2026
diff --git a/2.4-micro/.build-args-c9s b/2.4-micro/.build-args-c9s
diff --git a/2.4-micro/.exclude-c8s b/2.4-micro/.exclude-c8s
diff --git a/2.4-micro/2.4-micro b/2.4-micro/2.4-micro
diff --git a/2.4-micro/Dockerfile.c10s b/2.4-micro/Dockerfile.c10s
@@ -3,7 +3,7 @@ FROM quay.io/centos/centos:stream10-development AS build
 RUN mkdir -p /mnt/rootfs
 RUN MICRO_PKGS="coreutils-single glibc-minimal-langpack" && \
     INSTALL_PKGS="${MICRO_PKGS} httpd-core mod_ssl findutils hostname nss_wrapper-libs redhat-logos-httpd" && \
-    dnf install --installroot /mnt/rootfs ${INSTALL_PKGS} --releasever 9 --setopt install_weak_deps=false --nodocs -y && \
+    dnf install --installroot /mnt/rootfs ${INSTALL_PKGS} --releasever 10 --setopt install_weak_deps=false --nodocs -y && \
     dnf -y --installroot /mnt/rootfs clean all && \
     rm -rf /mnt/rootfs/var/cache/* /mnt/rootfs/var/log/dnf* /mnt/rootfs/var/log/yum.*
 
@@ -60,13 +60,12 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
     HTTPD_DATA_ORIG_PATH=/var/www \
     HTTPD_LOG_PATH=/var/log/httpd
 
-COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
-COPY ${HTTPD_VERSION}-micro/root /
-COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr
+COPY 2.4-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
+COPY 2.4-micro/root /
+COPY 2.4-micro/core-scripts/usr /usr
 
 WORKDIR ${HOME}
 
-# Add default user and prepare httpd
 RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \
   chown -R 1001:0 ${APP_ROOT} && \
   httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \

diff --git a/2.4-micro/Dockerfile.c9s b/2.4-micro/Dockerfile.c9s
@@ -60,13 +60,12 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
     HTTPD_DATA_ORIG_PATH=/var/www \
     HTTPD_LOG_PATH=/var/log/httpd
 
-COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
-COPY ${HTTPD_VERSION}-micro/root /
-COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr
+COPY 2.4-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
+COPY 2.4-micro/root /
+COPY 2.4-micro/core-scripts/usr /usr
 
 WORKDIR ${HOME}
 
-# Add default user and prepare httpd
 RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \
   chown -R 1001:0 ${APP_ROOT} && \
   httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \

diff --git a/2.4-micro/Dockerfile.fedora b/2.4-micro/Dockerfile.fedora
@@ -60,13 +60,12 @@ ENV HTTPD_CONTAINER_SCRIPTS_PATH=/usr/share/container-scripts/httpd/ \
     HTTPD_DATA_ORIG_PATH=/var/www \
     HTTPD_LOG_PATH=/var/log/httpd
 
-COPY ${HTTPD_VERSION}-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
-COPY ${HTTPD_VERSION}-micro/root /
-COPY ${HTTPD_VERSION}-micro/core-scripts/usr /usr
+COPY 2.4-micro/s2i/bin/ ${STI_SCRIPTS_PATH}
+COPY 2.4-micro/root /
+COPY 2.4-micro/core-scripts/usr /usr
 
 WORKDIR ${HOME}
 
-# Add default user and prepare httpd
 RUN useradd -u 1001 -r -g 0 -d ${HOME} -c "Default Application User" default && \
   chown -R 1001:0 ${APP_ROOT} && \
   httpd -v | grep -qe "Apache/${HTTPD_VERSION}" && echo "Found VERSION ${HTTPD_VERSION}" && \

diff --git a/2.4-micro/core-scripts b/2.4-micro/core-scripts
@@ -1 +1 @@
-../common/shared-scripts/core/
+../common/shared-scripts/core
diff --git a/2.4-micro/root b/2.4-micro/root
@@ -0,0 +1 @@
+../src/root
diff --git a/2.4-micro/root/usr/share/container-scripts/httpd/common.sh b/2.4-micro/root/usr/share/container-scripts/httpd/common.sh
diff --git a/2.4-micro/s2i b/2.4-micro/s2i
@@ -0,0 +1 @@
+../src/s2i
diff --git a/2.4-micro/test b/2.4-micro/test
@@ -0,0 +1 @@
+../test
diff --git a/2.4-micro/test/__init__.py b/2.4-micro/test/__init__.py
diff --git a/2.4-micro/test/check_imagestreams.py b/2.4-micro/test/check_imagestreams.py
diff --git a/2.4-micro/test/conftest.py b/2.4-micro/test/conftest.py
diff --git a/2.4-micro/test/examples b/2.4-micro/test/examples
diff --git a/2.4-micro/test/imagestreams b/2.4-micro/test/imagestreams
diff --git a/2.4-micro/test/run b/2.4-micro/test/run
diff --git a/2.4-micro/test/run-openshift-pytest b/2.4-micro/test/run-openshift-pytest
diff --git a/2.4-micro/test/run-openshift-remote-cluster b/2.4-micro/test/run-openshift-remote-cluster
diff --git a/2.4-micro/test/run-pytest b/2.4-micro/test/run-pytest
diff --git a/2.4-micro/test/sample-test-app b/2.4-micro/test/sample-test-app
diff --git a/2.4-micro/test/self-signed-ssl b/2.4-micro/test/self-signed-ssl
diff --git a/2.4-micro/test/settings.py b/2.4-micro/test/settings.py
diff --git a/2.4-micro/test/test-lib-httpd.sh b/2.4-micro/test/test-lib-httpd.sh
diff --git a/2.4-micro/test/test-lib-openshift.sh b/2.4-micro/test/test-lib-openshift.sh
diff --git a/2.4-micro/test/test-lib-remote-openshift.sh b/2.4-micro/test/test-lib-remote-openshift.sh
diff --git a/2.4-micro/test/test-lib.sh b/2.4-micro/test/test-lib.sh
diff --git a/2.4-micro/test/test_container_httpd.py b/2.4-micro/test/test_container_httpd.py
diff --git a/2.4-micro/test/test_container_httpd_s2i.py b/2.4-micro/test/test_container_httpd_s2i.py
diff --git a/2.4-micro/test/test_ocp_ex_template.py b/2.4-micro/test/test_ocp_ex_template.py
diff --git a/2.4-micro/test/test_ocp_imagestream_s2i.py b/2.4-micro/test/test_ocp_imagestream_s2i.py
diff --git a/2.4-micro/test/test_ocp_imagestreams.py b/2.4-micro/test/test_ocp_imagestreams.py
diff --git a/2.4-micro/test/test_ocp_integration.py b/2.4-micro/test/test_ocp_integration.py
diff --git a/2.4-micro/test/test_ocp_shared_helm_imagestreams.py b/2.4-micro/test/test_ocp_shared_helm_imagestreams.py
diff --git a/2.4-micro/test/test_ocp_shared_helm_template.py b/2.4-micro/test/test_ocp_shared_helm_template.py
diff --git a/2.4/root b/2.4/root
@@ -0,0 +1 @@
+../src/root
diff --git a/2.4/root/usr/bin/run-httpd b/2.4/root/usr/bin/run-httpd
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		../common/shared-scripts/core/
		../common/shared-scripts/core