Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions modules/swagger-generator/Dockerfile
Original file line number Diff line number Diff line change
@@ -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 && microdnf clean all
ENV disableOas31Resolve=False
ENV JAVA_HOME=/opt/java/openjdk
COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
Expand All @@ -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
Expand All @@ -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"]
Expand Down
20 changes: 11 additions & 9 deletions modules/swagger-generator/Dockerfile_root
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
FROM redhat/ubi9-minimal:9.6
RUN microdnf -y install which && \
microdnf -y install glibc-langpack-en && \
microdnf -y install tar && \
microdnf -y install gzip
FROM redhat/ubi9-minimal:9.7
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
Expand All @@ -12,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
Expand Down