diff --git a/src/apps/geoserver/catalog/Dockerfile.openj9 b/src/apps/geoserver/catalog/Dockerfile.openj9 deleted file mode 100644 index f616ac38c..000000000 --- a/src/apps/geoserver/catalog/Dockerfile.openj9 +++ /dev/null @@ -1,56 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -RUN apt update && \ -apt install -y fonts-deva \ -fonts-font-awesome \ -fonts-freefont-ttf \ -fonts-material-design-icons-iconfont \ -fonts-materialdesignicons-webfont \ -fonts-roboto - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -COPY --from=builder /usr/share/fonts/truetype/* /usr/share/fonts/truetype/ - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/catalog/pom.xml b/src/apps/geoserver/catalog/pom.xml index 5fc7c45dd..1eb29ed32 100644 --- a/src/apps/geoserver/catalog/pom.xml +++ b/src/apps/geoserver/catalog/pom.xml @@ -76,49 +76,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - package - - push - - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/gwc/Dockerfile.openj9 b/src/apps/geoserver/gwc/Dockerfile.openj9 deleted file mode 100644 index 20b457150..000000000 --- a/src/apps/geoserver/gwc/Dockerfile.openj9 +++ /dev/null @@ -1,48 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin /opt/app/data_directory /data/geowebcache -RUN chmod 0777 /opt/app/data_directory /data/geowebcache - -VOLUME /opt/app/data_directory -VOLUME /data/geowebcache - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - - -EXPOSE 8080 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/gwc/pom.xml b/src/apps/geoserver/gwc/pom.xml index 47d05decf..7dec7d3e2 100644 --- a/src/apps/geoserver/gwc/pom.xml +++ b/src/apps/geoserver/gwc/pom.xml @@ -122,49 +122,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - package - - install - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/restconfig/Dockerfile.openj9 b/src/apps/geoserver/restconfig/Dockerfile.openj9 deleted file mode 100644 index f616ac38c..000000000 --- a/src/apps/geoserver/restconfig/Dockerfile.openj9 +++ /dev/null @@ -1,56 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -RUN apt update && \ -apt install -y fonts-deva \ -fonts-font-awesome \ -fonts-freefont-ttf \ -fonts-material-design-icons-iconfont \ -fonts-materialdesignicons-webfont \ -fonts-roboto - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -COPY --from=builder /usr/share/fonts/truetype/* /usr/share/fonts/truetype/ - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/restconfig/pom.xml b/src/apps/geoserver/restconfig/pom.xml index 11460e2b5..0639c7eae 100644 --- a/src/apps/geoserver/restconfig/pom.xml +++ b/src/apps/geoserver/restconfig/pom.xml @@ -101,50 +101,6 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - package - - install - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - importer diff --git a/src/apps/geoserver/wcs/Dockerfile.openj9 b/src/apps/geoserver/wcs/Dockerfile.openj9 deleted file mode 100644 index dd6fcd40f..000000000 --- a/src/apps/geoserver/wcs/Dockerfile.openj9 +++ /dev/null @@ -1,46 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/wcs/pom.xml b/src/apps/geoserver/wcs/pom.xml index 70cfe0a06..e585b3cd9 100644 --- a/src/apps/geoserver/wcs/pom.xml +++ b/src/apps/geoserver/wcs/pom.xml @@ -93,49 +93,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/webui/Dockerfile.openj9 b/src/apps/geoserver/webui/Dockerfile.openj9 deleted file mode 100644 index 6ecb7bd4a..000000000 --- a/src/apps/geoserver/webui/Dockerfile.openj9 +++ /dev/null @@ -1,61 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -RUN apt update && \ -apt install -y fonts-deva \ -fonts-font-awesome \ -fonts-freefont-ttf \ -fonts-material-design-icons-iconfont \ -fonts-materialdesignicons-webfont \ -fonts-roboto - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -COPY --from=builder /usr/share/fonts/truetype/* /usr/share/fonts/truetype/ - -# REVISIT: ideally webui shouldn't even have access to the geowebcache -# directory, but since it needs to run a lot of gwc and gwc-gs integration -# services, it might still need it. -RUN mkdir -p /opt/app/bin /opt/app/data_directory /data/geowebcache -RUN chmod 0777 /opt/app/data_directory /data/geowebcache - -VOLUME /opt/app/data_directory -VOLUME /data/geowebcache - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/webui/pom.xml b/src/apps/geoserver/webui/pom.xml index a305a190b..8dd7448ad 100644 --- a/src/apps/geoserver/webui/pom.xml +++ b/src/apps/geoserver/webui/pom.xml @@ -196,49 +196,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/wfs/Dockerfile.openj9 b/src/apps/geoserver/wfs/Dockerfile.openj9 deleted file mode 100644 index d4c78e0ab..000000000 --- a/src/apps/geoserver/wfs/Dockerfile.openj9 +++ /dev/null @@ -1,47 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/wfs/pom.xml b/src/apps/geoserver/wfs/pom.xml index c2a3e03ad..1dfcd767c 100644 --- a/src/apps/geoserver/wfs/pom.xml +++ b/src/apps/geoserver/wfs/pom.xml @@ -90,49 +90,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/wms/Dockerfile.openj9 b/src/apps/geoserver/wms/Dockerfile.openj9 deleted file mode 100644 index c7ef98715..000000000 --- a/src/apps/geoserver/wms/Dockerfile.openj9 +++ /dev/null @@ -1,56 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -RUN apt update && \ -apt install -y fonts-deva \ -fonts-font-awesome \ -fonts-freefont-ttf \ -fonts-material-design-icons-iconfont \ -fonts-materialdesignicons-webfont \ -fonts-roboto - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -COPY --from=builder /usr/share/fonts/truetype/* /usr/share/fonts/truetype/ - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher - diff --git a/src/apps/geoserver/wms/pom.xml b/src/apps/geoserver/wms/pom.xml index 175b94fd6..f055eb90f 100644 --- a/src/apps/geoserver/wms/pom.xml +++ b/src/apps/geoserver/wms/pom.xml @@ -107,49 +107,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/geoserver/wps/Dockerfile.openj9 b/src/apps/geoserver/wps/Dockerfile.openj9 deleted file mode 100644 index dd6fcd40f..000000000 --- a/src/apps/geoserver/wps/Dockerfile.openj9 +++ /dev/null @@ -1,46 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin -RUN mkdir -p /opt/app/data_directory && chmod 0777 /opt/app/data_directory -VOLUME /opt/app/data_directory - -WORKDIR /opt/app/bin -ENV JAVA_TOOL_OPTS="\ ---add-exports=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.base/java.lang=ALL-UNNAMED \ ---add-opens=java.base/java.util=ALL-UNNAMED \ ---add-opens=java.base/java.lang.reflect=ALL-UNNAMED \ ---add-opens=java.base/java.text=ALL-UNNAMED \ ---add-opens=java.desktop/java.awt.font=ALL-UNNAMED \ ---add-opens=java.desktop/sun.awt.image=ALL-UNNAMED \ ---add-opens=java.naming/com.sun.jndi.ldap=ALL-UNNAMED \ --Djava.awt.headless=true" -ENV JAVA_OPTS= - - -EXPOSE 8080 -EXPOSE 8081 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS $JAVA_TOOL_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/geoserver/wps/pom.xml b/src/apps/geoserver/wps/pom.xml index 371342c18..6255c19ab 100644 --- a/src/apps/geoserver/wps/pom.xml +++ b/src/apps/geoserver/wps/pom.xml @@ -94,49 +94,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/infrastructure/admin/Dockerfile.openj9 b/src/apps/infrastructure/admin/Dockerfile.openj9 deleted file mode 100644 index b86e9db23..000000000 --- a/src/apps/infrastructure/admin/Dockerfile.openj9 +++ /dev/null @@ -1,31 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin - -WORKDIR /opt/app/bin -ENV JAVA_OPTS= -EXPOSE 8080 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/infrastructure/admin/pom.xml b/src/apps/infrastructure/admin/pom.xml index 70061d13a..860c72290 100644 --- a/src/apps/infrastructure/admin/pom.xml +++ b/src/apps/infrastructure/admin/pom.xml @@ -71,49 +71,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/infrastructure/config/Dockerfile.openj9 b/src/apps/infrastructure/config/Dockerfile.openj9 deleted file mode 100644 index 5facd2ac3..000000000 --- a/src/apps/infrastructure/config/Dockerfile.openj9 +++ /dev/null @@ -1,34 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin - -# Where jgit will try to create a .config directory -ENV XDG_CONFIG_HOME=/tmp - -WORKDIR /opt/app/bin -ENV JAVA_OPTS= -EXPOSE 8080 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/infrastructure/config/pom.xml b/src/apps/infrastructure/config/pom.xml index 2e8328829..879a11098 100644 --- a/src/apps/infrastructure/config/pom.xml +++ b/src/apps/infrastructure/config/pom.xml @@ -166,105 +166,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - org.springframework.boot - spring-boot-maven-plugin - - - repackage - - repackage - - - bin - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - - - build-image - - false - - - - - org.springframework.boot - spring-boot-maven-plugin - - - build-image - - build-image - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/src/apps/infrastructure/discovery/Dockerfile.openj9 b/src/apps/infrastructure/discovery/Dockerfile.openj9 deleted file mode 100644 index 95743e003..000000000 --- a/src/apps/infrastructure/discovery/Dockerfile.openj9 +++ /dev/null @@ -1,31 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin - -WORKDIR /opt/app/bin -ENV JAVA_OPTS= -EXPOSE 8761 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/infrastructure/discovery/pom.xml b/src/apps/infrastructure/discovery/pom.xml index b885850f1..b5fc56c66 100644 --- a/src/apps/infrastructure/discovery/pom.xml +++ b/src/apps/infrastructure/discovery/pom.xml @@ -78,49 +78,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - - diff --git a/src/apps/infrastructure/gateway/Dockerfile.openj9 b/src/apps/infrastructure/gateway/Dockerfile.openj9 deleted file mode 100644 index b86e9db23..000000000 --- a/src/apps/infrastructure/gateway/Dockerfile.openj9 +++ /dev/null @@ -1,31 +0,0 @@ -FROM ibm-semeru-runtimes:open-17-jre as builder -ARG JAR_FILE=target/gs-cloud-*-bin.jar - -COPY ${JAR_FILE} application.jar - -RUN java -Djarmode=layertools -jar application.jar extract - -########## -FROM ibm-semeru-runtimes:open-17-jre - -LABEL maintainer="GeoServer PSC " - -RUN mkdir -p /opt/app/bin - -WORKDIR /opt/app/bin -ENV JAVA_OPTS= -EXPOSE 8080 - -COPY --from=builder dependencies/ ./ -COPY --from=builder snapshot-dependencies/ ./ -COPY --from=builder spring-boot-loader/ ./ -COPY --from=builder application/ ./ - -HEALTHCHECK \ ---interval=10s \ ---timeout=5s \ ---start-period=30s \ ---retries=5 \ -CMD curl -f -s -o /dev/null localhost:8081/actuator/health || exit 1 - -CMD exec env USER_ID="$(id -u)" USER_GID="$(id -g)" java $JAVA_OPTS org.springframework.boot.loader.JarLauncher diff --git a/src/apps/infrastructure/gateway/pom.xml b/src/apps/infrastructure/gateway/pom.xml index 62c45551d..a9dce1e79 100644 --- a/src/apps/infrastructure/gateway/pom.xml +++ b/src/apps/infrastructure/gateway/pom.xml @@ -101,49 +101,5 @@ - - docker-openj9 - - false - - openj9 - - - - - - com.spotify - dockerfile-maven-plugin - - - build-openj9-image - - build - - - Dockerfile.openj9 - ${project.version}-openj9 - - ${project.version}-openj9 - target/${project.build.finalName}-bin.jar - - - - - push-openj9-image - - push - - package - - ${dockerfile.push.skip} - ${project.version}-openj9 - - - - - - -