Base TomEE smoke test images on jdk ones
MODIFY
smoke-tests/images/servlet/build.gradle
smoke-tests/images/servlet/build.gradle
@@ -47,10 +47,12 @@ def linuxTargets = [
[version: ["10.0.11"], vm: ["openj9"], jdk: ["8", "11"], args: [majorVersion: "10"], war: "servlet-5.0"]
],
"tomee" : [
- [version: ["7.0.0"], vm: ["hotspot"], jdk: ["8"]],
- [version: ["7.0.0"], vm: ["openj9"], jdk: ["8"], dockerfile: "tomee-custom"],
- [version: ["8.0.6"], vm: ["hotspot"], jdk: ["8", "11"]],
- [version: ["8.0.6"], vm: ["openj9"], jdk: ["8", "11"], dockerfile: "tomee-custom"]
+ [version: ["7.0.9"], vm: ["hotspot", "openj9"], jdk: ["8"]],
+ [version: ["7.1.4"], vm: ["hotspot", "openj9"], jdk: ["8"]],
+ [version: ["8.0.8"], vm: ["hotspot"], jdk: ["8", "11", "17"]],
+ [version: ["8.0.8"], vm: ["openj9"], jdk: ["8", "11", "16"]],
+ [version: ["9.0.0-M7"], vm: ["hotspot"], jdk: ["8", "11", "17"], war: "servlet-5.0"],
+ [version: ["9.0.0-M7"], vm: ["openj9"], jdk: ["8", "11", "16"], war: "servlet-5.0"]
],
"payara" : [
[version: ["5.2020.6"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
@@ -70,10 +72,7 @@ def linuxTargets = [
def windowsTargets = [
"jetty" : linuxTargets["jetty"],
"tomcat" : linuxTargets["tomcat"],
- "tomee" : [
- [version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],
- [version: ["8.0.6"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
- ],
+ "tomee" : linuxTargets["tomee"],
"payara" : linuxTargets["payara"],
"wildfly": [
[version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],

DELETE
smoke-tests/images/servlet/src/tomee-custom.dockerfile
-ARG jdkImage
-ARG jdk
-ARG version
-
-FROM tomee:${jdk}-jre-${version}-webprofile as default
-
-FROM ${jdkImage}
-
-ENV SERVER_BASE=/usr/local/tomee
-COPY --from=default $SERVER_BASE $SERVER_BASE
-WORKDIR $SERVER_BASE
-
-EXPOSE 8080
-CMD ["bin/catalina.sh", "run"]
-COPY app.war $SERVER_BASE/webapps/

MODIFY
smoke-tests/images/servlet/src/tomee.dockerfile
smoke-tests/images/servlet/src/tomee.dockerfile
+ARG jdkImage
+
+# Unzip in a separate container so that zip file layer is not part of final image
+FROM ${jdkImage} as builder
ARG version
-ARG jdk
-FROM tomee:${jdk}-jre-${version}-webprofile
+ADD https://archive.apache.org/dist/tomee/tomee-${version}/apache-tomee-${version}-webprofile.tar.gz /server.tgz
+RUN tar xf server.tgz && ls -al / && mv apache-tomee-webprofile-${version} /server
+
+FROM ${jdkImage}
+COPY --from=builder /server /server
+
+WORKDIR /server/bin
+CMD /server/bin/catalina.sh run
-COPY app.war /usr/local/tomee/webapps/
\ No newline at end of file
+COPY app.war /server/webapps/
\ No newline at end of file

Base TomEE smoke test images on jdk ones (#4425)