Reference microsoft java image so we can build against 21

deephaven · Oct 5, 2023 · d882f40 · d882f40
1 parent 37ac0ba
commit d882f40
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/contexts/server/Dockerfile b/contexts/server/Dockerfile
@@ -6,7 +6,7 @@ ARG DEEPHAVEN_SOURCES
 
 # -------------------------------------
 
-FROM docker.io/eclipse-temurin:${OPENJDK_VERSION} as openjdk
+FROM mcr.microsoft.com/openjdk/jdk:${OPENJDK_VERSION}-ubuntu as openjdk
 
 # -------------------------------------
 
@@ -134,13 +134,13 @@ LABEL \
 
 FROM venv-bits-${DEEPHAVEN_SOURCES} as openjdk-bits
 ARG OPENJDK_VERSION
-COPY --link --from=openjdk /opt/java/openjdk /opt/java/openjdk
+COPY --link --from=openjdk /usr/lib/jvm/msopenjdk-${OPENJDK_VERSION}-amd64 /opt/java/openjdk
 ENV \
     JAVA_HOME="/opt/java/openjdk" \
     PATH="/opt/java/openjdk/bin:${PATH}"
 LABEL \
     io.deephaven.server.java.version="${OPENJDK_VERSION}" \
-    io.deephaven.server.java.base.name="docker.io/eclipse-temurin:${OPENJDK_VERSION}"
+    io.deephaven.server.java.base.name="mcr.microsoft.com/openjdk/jdk:${OPENJDK_VERSION}-ubuntu"
 
 # -------------------------------------