From f73fbd9337ff3a6b6e83b445285a77c93e3f2187 Mon Sep 17 00:00:00 2001 From: Mateusz Wronski Date: Fri, 9 Jan 2026 13:28:09 +0100 Subject: [PATCH 1/3] ci(baseimage): upgrade base image to redhat/ubi9-minimal:9.7 from 9.6 cleanup dockerfiles a bit as well --- modules/swagger-generator/Dockerfile | 29 ++++++++++++----------- modules/swagger-generator/Dockerfile_root | 10 ++++---- 2 files changed, 20 insertions(+), 19 deletions(-) diff --git a/modules/swagger-generator/Dockerfile b/modules/swagger-generator/Dockerfile index 293d839b145..78d23880437 100644 --- a/modules/swagger-generator/Dockerfile +++ b/modules/swagger-generator/Dockerfile @@ -1,9 +1,10 @@ -FROM redhat/ubi9-minimal:9.6 -RUN microdnf -y install shadow-utils -RUN microdnf -y install which -RUN microdnf -y install glibc-langpack-en -RUN microdnf -y install tar -RUN microdnf -y install gzip +FROM redhat/ubi9-minimal:9.7 +RUN microdnf -y install \ + glibc-langpack-en \ + gzip \ + shadow-utils \ + tar \ + which ENV disableOas31Resolve=False ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME @@ -13,10 +14,10 @@ COPY docker/environment /etc/environment WORKDIR /jetty_home COPY docker/jetty /jetty_home/ COPY target/lib/jetty* /jetty_home/lib/ -RUN mkdir /jetty_home/lib/shared -RUN chgrp -R 0 /jetty_home/lib/shared && \ - chmod -R g=u /jetty_home/lib/shared -RUN rm /jetty_home/lib/jetty-runner* +RUN mkdir /jetty_home/lib/shared && \ + chgrp -R 0 /jetty_home/lib/shared && \ + chmod -R g=u /jetty_home/lib/shared && \ + rm /jetty_home/lib/jetty-runner* COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar COPY target/lib/start.jar /jetty_home/ ENV JETTY_HOME /jetty_home @@ -36,10 +37,10 @@ ENV JAVA_MEM ${JAVA_MEM} ENV EXIT_ON_OUTOFMEMORYERROR "" WORKDIR $JETTY_BASE -RUN groupadd --gid 2000 codegengroup -RUN useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser -RUN chown -R codegenuser /generator -RUN chown -R codegenuser /jetty_home +RUN groupadd --gid 2000 codegengroup && \ + useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser && \ + chown -R codegenuser /generator && \ + chown -R codegenuser /jetty_home USER codegenuser CMD ["./start"] diff --git a/modules/swagger-generator/Dockerfile_root b/modules/swagger-generator/Dockerfile_root index c6fcfcb4fe0..df8e3a297b0 100644 --- a/modules/swagger-generator/Dockerfile_root +++ b/modules/swagger-generator/Dockerfile_root @@ -1,4 +1,4 @@ -FROM redhat/ubi9-minimal:9.6 +FROM redhat/ubi9-minimal:9.7 RUN microdnf -y install which && \ microdnf -y install glibc-langpack-en && \ microdnf -y install tar && \ @@ -12,10 +12,10 @@ COPY docker/environment /etc/environment WORKDIR /jetty_home COPY docker/jetty /jetty_home/ COPY target/lib/jetty* /jetty_home/lib/ -RUN mkdir /jetty_home/lib/shared -RUN chgrp -R 0 /jetty_home/lib/shared && \ - chmod -R g=u /jetty_home/lib/shared -RUN rm /jetty_home/lib/jetty-runner* +RUN mkdir /jetty_home/lib/shared && \ + chgrp -R 0 /jetty_home/lib/shared && \ + chmod -R g=u /jetty_home/lib/shared && \ + rm /jetty_home/lib/jetty-runner* COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar COPY target/lib/start.jar /jetty_home/ ENV JETTY_HOME /jetty_home From f7208f67102f0918b141f4d9024ba42a43eb28b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Mateusz=20Wro=C5=84ski?= Date: Fri, 9 Jan 2026 14:16:45 +0100 Subject: [PATCH 2/3] Update modules/swagger-generator/Dockerfile Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com> --- modules/swagger-generator/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/swagger-generator/Dockerfile b/modules/swagger-generator/Dockerfile index 78d23880437..64b262d43e6 100644 --- a/modules/swagger-generator/Dockerfile +++ b/modules/swagger-generator/Dockerfile @@ -4,7 +4,7 @@ RUN microdnf -y install \ gzip \ shadow-utils \ tar \ - which + which && microdnf clean all ENV disableOas31Resolve=False ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME From f5b180dcbd6a495a66ac896f30c065fff479d194 Mon Sep 17 00:00:00 2001 From: Mateusz Wronski Date: Fri, 9 Jan 2026 14:20:16 +0100 Subject: [PATCH 3/3] ci(baseimage): optimize installation commands in Dockerfile for redhat/ubi9-minimal:9.7 --- modules/swagger-generator/Dockerfile_root | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/modules/swagger-generator/Dockerfile_root b/modules/swagger-generator/Dockerfile_root index df8e3a297b0..0014ddf5082 100644 --- a/modules/swagger-generator/Dockerfile_root +++ b/modules/swagger-generator/Dockerfile_root @@ -1,8 +1,10 @@ FROM redhat/ubi9-minimal:9.7 -RUN microdnf -y install which && \ - microdnf -y install glibc-langpack-en && \ - microdnf -y install tar && \ - microdnf -y install gzip +RUN microdnf -y install \ + glibc-langpack-en \ + gzip \ + tar \ + which && \ + microdnf clean all ENV disableOas31Resolve=False ENV JAVA_HOME=/opt/java/openjdk COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME