Skip to content

Commit f62f0c4

Browse files
authored
Update Maven and use OpenJDK from build (#199)
1 parent 820a560 commit f62f0c4

File tree

1 file changed

+5
-14
lines changed

1 file changed

+5
-14
lines changed

Dockerfile

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Licensed under the Universal Permissive License v 1.0 as shown at https://oss.oracle.com/licenses/upl.
33

44
# First layer: dependencies for the project, cached in the /root/.m2 directory
5-
FROM maven:3.8.6-eclipse-temurin-17 as m2repo
5+
FROM maven:3-openjdk-18-slim as m2repo
66
ARG MAVEN_OPTS
77

88
WORKDIR /project/
@@ -14,7 +14,7 @@ COPY wls-exporter-sidecar/pom.xml wls-exporter-sidecar/
1414
RUN mvn -B -e -C org.apache.maven.plugins:maven-dependency-plugin:3.1.2:go-offline -Ddocker-build
1515

1616
# Now build the project on top of that first layer
17-
FROM maven:3.8.6-eclipse-temurin-17 as build
17+
FROM maven:3-openjdk-18-slim as build
1818
ARG MAVEN_OPTS
1919

2020
WORKDIR /project/
@@ -24,18 +24,9 @@ COPY build-helper-mojo/ build-helper-mojo/
2424
COPY wls-exporter-core/ wls-exporter-core/
2525
COPY wls-exporter-sidecar/ wls-exporter-sidecar/
2626

27-
RUN mvn -B -e -C install -Ddocker-build -DskipTests=true
28-
29-
FROM ghcr.io/oracle/oraclelinux:8-slim AS jre-build
30-
31-
ENV JAVA_URL="https://download.java.net/java/GA/jdk18.0.2/f6ad4b4450fd4d298113270ec84f30ee/9/GPL/openjdk-18.0.2_linux-x64_bin.tar.gz"
32-
3327
RUN set -eux; \
34-
microdnf -y install gzip tar; \
35-
curl -fL -o /jdk.tar.gz "$JAVA_URL"; \
36-
mkdir -p /jdk; \
37-
tar --extract --file /jdk.tar.gz --directory /jdk --strip-components 1; \
38-
/jdk/bin/jlink --verbose --compress 2 --strip-java-debug-attributes --no-header-files --no-man-pages --output jre --add-modules java.base,java.logging,java.desktop,java.instrument,java.management,java.naming,java.net.http,java.security.jgss,java.sql,jdk.attach,jdk.jdi,jdk.jfr,jdk.management,jdk.management.jfr,jdk.net,jdk.unsupported,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.zipfs
28+
mvn -B -e -C install -Ddocker-build -DskipTests=true; \
29+
$JAVA_HOME/bin/jlink --verbose --compress 2 --strip-java-debug-attributes --no-header-files --no-man-pages --output /jre --add-modules java.base,java.logging,java.desktop,java.instrument,java.management,java.naming,java.net.http,java.security.jgss,java.sql,jdk.attach,jdk.jdi,jdk.jfr,jdk.management,jdk.management.jfr,jdk.net,jdk.unsupported,jdk.crypto.cryptoki,jdk.crypto.ec,jdk.zipfs
3930

4031
FROM ghcr.io/oracle/oraclelinux:8-slim
4132

@@ -47,7 +38,7 @@ LABEL "org.opencontainers.image.authors"="Ryan Eberhard <ryan.eberhard@oracle.co
4738
"org.opencontainers.image.description"="Oracle WebLogic Monitoring Exporter" \
4839
"org.opencontainers.image.documentation"="https://github.com/oracle/weblogic-monitoring-exporter"
4940

50-
COPY --from=jre-build /jre jre
41+
COPY --from=build /jre jre
5142

5243
RUN set -eux; \
5344
microdnf -y update; \

0 commit comments

Comments
 (0)