switch generator-v3 docker image to ubi-minimal jre-17

frantuma · frantuma · commit d626d389a2d3 · 2023-01-27T12:44:54.000+01:00
diff --git a/modules/swagger-generator/Dockerfile b/modules/swagger-generator/Dockerfile
@@ -1,8 +1,12 @@
-FROM ubuntu:22.04
+FROM redhat/ubi9-minimal:9.1
+RUN microdnf -y install shadow-utils
+RUN microdnf -y install which
+RUN microdnf -y install glibc-langpack-en
 ENV disableOas31Resolve=False
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:8u322-b06-jre $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
+COPY docker/environment /etc/environment
 
 WORKDIR /jetty_home
 COPY docker/jetty /jetty_home/
@@ -24,10 +28,11 @@ ARG HTTP_PORT
 ENV HTTP_PORT ${HTTP_PORT}
 ARG JAVA_MEM
 ENV JAVA_MEM ${JAVA_MEM}
+ENV EXIT_ON_OUTOFMEMORYERROR ""
 WORKDIR $JETTY_BASE
 
-RUN addgroup --gid 2000 codegengroup
-RUN adduser --home "/generator" --ingroup codegengroup --disabled-password --gecos '' --shell "/bin/bash" --uid "1000" codegenuser
+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
 
diff --git a/modules/swagger-generator/Dockerfile_root b/modules/swagger-generator/Dockerfile_root
@@ -1,8 +1,11 @@
-FROM ubuntu:22.04
+FROM redhat/ubi9-minimal:9.1
+RUN microdnf -y install which
+RUN microdnf -y install glibc-langpack-en
 ENV disableOas31Resolve=False
 ENV JAVA_HOME=/opt/java/openjdk
-COPY --from=eclipse-temurin:8u322-b06-jre $JAVA_HOME $JAVA_HOME
+COPY --from=eclipse-temurin:17-jre $JAVA_HOME $JAVA_HOME
 ENV PATH="${JAVA_HOME}/bin:${PATH}"
+COPY docker/environment /etc/environment
 
 WORKDIR /jetty_home
 COPY docker/jetty /jetty_home/
@@ -11,6 +14,7 @@ RUN 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
+
 WORKDIR /generator
 COPY docker/jetty_base /generator/
 COPY docker/ROOT.xml /generator/webapps/ROOT.xml
@@ -23,5 +27,6 @@ ARG HTTP_PORT
 ENV HTTP_PORT ${HTTP_PORT}
 ARG JAVA_MEM
 ENV JAVA_MEM ${JAVA_MEM}
+ENV EXIT_ON_OUTOFMEMORYERROR ""
 WORKDIR $JETTY_BASE
 CMD ["./start"]
diff --git a/modules/swagger-generator/docker/ROOT.xml b/modules/swagger-generator/docker/ROOT.xml
@@ -13,7 +13,7 @@
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
   <Set name="contextPath">/</Set>
   <Set name="war"><Property name="jetty.webapps" default="."/>/ROOT.war</Set>
-  <New id="jarFilter" class="sun.misc.JarFilter">
+  <New id="jarFilter" class="io.swagger.v3.generator.filter.JarFilter">
   </New>
   <New id="classpathDirFile" class="java.io.File">
     <Arg>/jetty_home/lib/shared</Arg>
diff --git a/modules/swagger-generator/docker/environment b/modules/swagger-generator/docker/environment
@@ -0,0 +1,2 @@
+LANG=en_US.utf-8
+LC_ALL=en_US.utf-8
diff --git a/modules/swagger-generator/docker/jetty/lib/classpathfilter.jar b/modules/swagger-generator/docker/jetty/lib/classpathfilter.jar
diff --git a/modules/swagger-generator/docker/jetty/modules/deploy.mod b/modules/swagger-generator/docker/jetty/modules/deploy.mod
@@ -7,6 +7,7 @@ Enables webapplication deployment from the webapps directory.
 webapp
 
 [lib]
+lib/classpathfilter.jar
 lib/jetty-deploy-${jetty.version}.jar
 
 [files]
diff --git a/modules/swagger-generator/docker/jetty_base/start b/modules/swagger-generator/docker/jetty_base/start
@@ -31,6 +31,10 @@ export LC_ALL=en_US.utf-8
 NEW_SIZE=${JAVA_NEW-128m}
 PERM_SIZE=${JAVA_PERM-128m}
 HEAP=${JAVA_MEM-512m}
+EXIT_ON_OUTOFMEMORYERROR_OPTION=
+if [ ! -z "$EXIT_ON_OUTOFMEMORYERROR" ]; then
+    EXIT_ON_OUTOFMEMORYERROR_OPTION=-XX:+ExitOnOutOfMemoryError
+fi
 
 mkdir -p work
 
@@ -43,7 +47,7 @@ JAVA_DEBUG_OPTIONS="-Xdebug -Xrunjdwp:transport=dt_socket,address=8005,server=y,
 # APP options
 APP_OPTS="-DHIDDEN_OPTIONS_PATH=${HIDDEN_OPTIONS_PATH} -DHIDDEN_OPTIONS=${HIDDEN_OPTIONS}"
 # JVM options
-JAVA_OPTS="-Djava.security.manager -Djava.security.policy==grantall.policy -DgeneratorWriteDirs="/tmp" -server -Duser.timezone=GMT -Xms${HEAP} -Xmx${HEAP} -XX:NewSize=${NEW_SIZE} -XX:MaxNewSize=${NEW_SIZE} -XX:+UseConcMarkSweepGC -XX:+UseParNewGC -XX:PermSize=${PERM_SIZE} -XX:MaxPermSize=${PERM_SIZE} -Dfile.encoding=UTF-8"
+JAVA_OPTS="-Djava.security.manager -Djava.security.policy==grantall.policy -DgeneratorWriteDirs="/tmp" -server -Duser.timezone=GMT -Xms${HEAP} -Xmx${HEAP} -XX:NewSize=${NEW_SIZE} -XX:MaxNewSize=${NEW_SIZE} ${EXIT_ON_OUTOFMEMORYERROR_OPTION} -Dfile.encoding=UTF-8"
 
 echo "Starting application with command: "
 echo ${JAVA_EXEC} ${JETTY_OPTS} ${APP_OPTS} ${JAVA_OPTS} -jar $JETTY_HOME/start.jar
diff --git a/pom.docker.xml b/pom.docker.xml
@@ -1138,7 +1138,7 @@
         <reflections-version>0.9.11</reflections-version>
         <jmockit-version>1.42</jmockit-version>
         <snakeyaml-version>1.33</snakeyaml-version>
-        <handlebars-version>4.3.0</handlebars-version>
+        <handlebars-version>4.3.1</handlebars-version>
         <jersey-version>2.35</jersey-version>
     </properties>
 </project>
diff --git a/pom.xml b/pom.xml
@@ -1242,7 +1242,7 @@
         <reflections-version>0.9.11</reflections-version>
         <jmockit-version>1.42</jmockit-version>
         <snakeyaml-version>1.33</snakeyaml-version>
-        <handlebars-version>4.3.0</handlebars-version>
+        <handlebars-version>4.3.1</handlebars-version>
         <jersey-version>2.35</jersey-version>
     </properties>
 </project>

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+LANG=en_US.utf-8`
	`2`	`+LC_ALL=en_US.utf-8`