Base Payara smoke test images on jdk ones
MODIFY
smoke-tests/images/servlet/build.gradle
smoke-tests/images/servlet/build.gradle
@@ -53,9 +53,7 @@ def linuxTargets = [
[version: ["8.0.6"], vm: ["openj9"], jdk: ["8", "11"], dockerfile: "tomee-custom"]
],
"payara" : [
- [version: ["5.2020.6"], vm: ["hotspot"], jdk: ["8"], args: [tagSuffix: ""]],
- [version: ["5.2020.6"], vm: ["hotspot"], jdk: ["11"], args: [tagSuffix: "-jdk11"]],
- [version: ["5.2020.6"], vm: ["openj9"], jdk: ["8", "11"], dockerfile: "payara-custom-5.2020.6"]
+ [version: ["5.2020.6"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
],
"wildfly": [
[version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
@@ -83,9 +81,7 @@ def windowsTargets = [
[version: ["7.0.0"], vm: ["hotspot", "openj9"], jdk: ["8"]],
[version: ["8.0.6"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
],
- "payara" : [
- [version: ["5.2020.6"], vm: ["hotspot", "openj9"], jdk: ["8", "11"]]
- ],
+ "payara" : linuxTargets["payara"],
"wildfly": [
[version: ["13.0.0.Final"], vm: ["hotspot", "openj9"], jdk: ["8"]],
[version: ["17.0.1.Final", "21.0.0.Final"], vm: ["hotspot"], jdk: ["8", "11", "17"]],

DELETE
smoke-tests/images/servlet/src/payara-custom-5.2020.6.dockerfile
-ARG jdkImage
-ARG version
-
-FROM payara/server-full:${version} as default
-
-FROM ${jdkImage}
-
-# These environment variables have been confirmed to work with 5.2020.6 only
-ENV HOME_DIR=/opt/payara
-ENV PAYARA_DIR="${HOME_DIR}/appserver" \
- SCRIPT_DIR="${HOME_DIR}/scripts" \
- CONFIG_DIR="${HOME_DIR}/config" \
- DEPLOY_DIR="${HOME_DIR}/deployments" \
- PASSWORD_FILE="${HOME_DIR}/passwordFile" \
- ADMIN_USER="admin" \
- ADMIN_PASSWORD="admin" \
- MEM_MAX_RAM_PERCENTAGE=70.0 \
- MEM_XSS=512k \
- DOMAIN_NAME="production" \
- PREBOOT_COMMANDS="${HOME_DIR}/config/pre-boot-commands.asadmin" \
- POSTBOOT_COMMANDS="${HOME_DIR}/config/post-boot-commands.asadmin" \
- PATH="${PATH}:${HOME_DIR}/scripts"
-
-COPY --from=default $HOME_DIR $HOME_DIR
-RUN rm ${PAYARA_DIR}/glassfish/modules/phonehome-bootstrap.jar
-
-WORKDIR $HOME_DIR
-
-EXPOSE 8080
-CMD ["entrypoint.sh"]
-COPY app.war $DEPLOY_DIR

MODIFY
smoke-tests/images/servlet/src/payara.dockerfile
smoke-tests/images/servlet/src/payara.dockerfile
+ARG jdkImage
ARG version
-ARG tagSuffix
-FROM payara/server-full:${version}${tagSuffix}
+FROM payara/server-full:${version} as builder
+FROM ${jdkImage}
+
+# These environment variables have been confirmed to work with 5.2020.6 only
+ENV HOME_DIR=/opt/payara
+ENV PAYARA_DIR="${HOME_DIR}/appserver" \
+ SCRIPT_DIR="${HOME_DIR}/scripts" \
+ CONFIG_DIR="${HOME_DIR}/config" \
+ DEPLOY_DIR="${HOME_DIR}/deployments" \
+ PASSWORD_FILE="${HOME_DIR}/passwordFile" \
+ ADMIN_USER="admin" \
+ ADMIN_PASSWORD="admin" \
+ MEM_MAX_RAM_PERCENTAGE=70.0 \
+ MEM_XSS=512k \
+ DOMAIN_NAME="production" \
+ PREBOOT_COMMANDS="${HOME_DIR}/config/pre-boot-commands.asadmin" \
+ POSTBOOT_COMMANDS="${HOME_DIR}/config/post-boot-commands.asadmin" \
+ PATH="${PATH}:${HOME_DIR}/scripts"
+
+COPY --from=builder $HOME_DIR $HOME_DIR
RUN rm ${PAYARA_DIR}/glassfish/modules/phonehome-bootstrap.jar
+WORKDIR $HOME_DIR
+
+EXPOSE 8080
+CMD ["entrypoint.sh"]
COPY app.war $DEPLOY_DIR

Base Payara smoke test images on jdk ones (#4426)