Skip to content

Commit f9e9790

Browse files
kopernic-plCopilot
andauthored
update the base image to red hat ubi 9.7 (#12663)
Co-authored-by: Copilot <175728472+Copilot@users.noreply.github.com>
1 parent 540a607 commit f9e9790

File tree

2 files changed

+26
-23
lines changed

2 files changed

+26
-23
lines changed

modules/swagger-generator/Dockerfile

Lines changed: 15 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
FROM redhat/ubi9-minimal:9.6
2-
RUN microdnf -y install shadow-utils
3-
RUN microdnf -y install which
4-
RUN microdnf -y install glibc-langpack-en
5-
RUN microdnf -y install tar
6-
RUN microdnf -y install gzip
1+
FROM redhat/ubi9-minimal:9.7
2+
RUN microdnf -y install \
3+
glibc-langpack-en \
4+
gzip \
5+
shadow-utils \
6+
tar \
7+
which && microdnf clean all
78
ENV disableOas31Resolve=False
89
ENV JAVA_HOME=/opt/java/openjdk
910
COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
@@ -13,10 +14,10 @@ COPY docker/environment /etc/environment
1314
WORKDIR /jetty_home
1415
COPY docker/jetty /jetty_home/
1516
COPY target/lib/jetty* /jetty_home/lib/
16-
RUN mkdir /jetty_home/lib/shared
17-
RUN chgrp -R 0 /jetty_home/lib/shared && \
18-
chmod -R g=u /jetty_home/lib/shared
19-
RUN rm /jetty_home/lib/jetty-runner*
17+
RUN mkdir /jetty_home/lib/shared && \
18+
chgrp -R 0 /jetty_home/lib/shared && \
19+
chmod -R g=u /jetty_home/lib/shared && \
20+
rm /jetty_home/lib/jetty-runner*
2021
COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar
2122
COPY target/lib/start.jar /jetty_home/
2223
ENV JETTY_HOME /jetty_home
@@ -36,10 +37,10 @@ ENV JAVA_MEM ${JAVA_MEM}
3637
ENV EXIT_ON_OUTOFMEMORYERROR ""
3738
WORKDIR $JETTY_BASE
3839

39-
RUN groupadd --gid 2000 codegengroup
40-
RUN useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser
41-
RUN chown -R codegenuser /generator
42-
RUN chown -R codegenuser /jetty_home
40+
RUN groupadd --gid 2000 codegengroup && \
41+
useradd --home "/generator" --gid codegengroup --shell "/bin/bash" --uid "1000" codegenuser && \
42+
chown -R codegenuser /generator && \
43+
chown -R codegenuser /jetty_home
4344

4445
USER codegenuser
4546
CMD ["./start"]

modules/swagger-generator/Dockerfile_root

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
1-
FROM redhat/ubi9-minimal:9.6
2-
RUN microdnf -y install which && \
3-
microdnf -y install glibc-langpack-en && \
4-
microdnf -y install tar && \
5-
microdnf -y install gzip
1+
FROM redhat/ubi9-minimal:9.7
2+
RUN microdnf -y install \
3+
glibc-langpack-en \
4+
gzip \
5+
tar \
6+
which && \
7+
microdnf clean all
68
ENV disableOas31Resolve=False
79
ENV JAVA_HOME=/opt/java/openjdk
810
COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
@@ -12,10 +14,10 @@ COPY docker/environment /etc/environment
1214
WORKDIR /jetty_home
1315
COPY docker/jetty /jetty_home/
1416
COPY target/lib/jetty* /jetty_home/lib/
15-
RUN mkdir /jetty_home/lib/shared
16-
RUN chgrp -R 0 /jetty_home/lib/shared && \
17-
chmod -R g=u /jetty_home/lib/shared
18-
RUN rm /jetty_home/lib/jetty-runner*
17+
RUN mkdir /jetty_home/lib/shared && \
18+
chgrp -R 0 /jetty_home/lib/shared && \
19+
chmod -R g=u /jetty_home/lib/shared && \
20+
rm /jetty_home/lib/jetty-runner*
1921
COPY target/lib/javax.servlet-api* /jetty_home/lib/servlet-api-3.1.jar
2022
COPY target/lib/start.jar /jetty_home/
2123
ENV JETTY_HOME /jetty_home

0 commit comments

Comments
 (0)