From 8170b0aa5290b3d42a7ae016a7d7eef3258a61be Mon Sep 17 00:00:00 2001
From: Yury Semikhatsky <yurys@chromium.org>
Date: Tue, 25 Oct 2022 09:28:59 -0700
Subject: [PATCH] feat(docker): set JAVA_HOME to openjdk 17

---
 utils/docker/Dockerfile.focal | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/utils/docker/Dockerfile.focal b/utils/docker/Dockerfile.focal
index cc28857d7..96b48d053 100644
--- a/utils/docker/Dockerfile.focal
+++ b/utils/docker/Dockerfile.focal
@@ -5,8 +5,13 @@ ARG DOCKER_IMAGE_NAME_TEMPLATE="mcr.microsoft.com/playwright/java:v%version%-foc
 # === INSTALL JDK and Maven ===
 
 RUN apt-get update && \
+    # Install install jdk 17 in a separate apt-get command so that
+    # installing maven doesn't bring in jdk 11
+    apt-get install -y --no-install-recommends openjdk-17-jdk && \
     apt-get install -y --no-install-recommends \
-    openjdk-17-jdk maven \
+    # Ubuntu 22.04 and earlier come with Maven 3.6.3 which fails with
+    # Java 17, so we install latest Maven from Apache instead.
+    # maven \
     # Install utilities required for downloading browsers
     curl \
     # Install utilities required for downloading driver
@@ -17,8 +22,12 @@ RUN apt-get update && \
     # Create the pwuser
     adduser pwuser
 
+RUN VERSION=3.8.6 && \
+    curl -o - https://dlcdn.apache.org/maven/maven-3/$VERSION/binaries/apache-maven-$VERSION-bin.tar.gz | tar zxfv - -C /opt/ && \
+    ln -s /opt/apache-maven-$VERSION/bin/mvn /usr/local/bin/
+
 ARG PW_TARGET_ARCH
-ENV JAVA_HOME=/usr/lib/jvm/java-11-openjdk-${PW_TARGET_ARCH}
+ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-${PW_TARGET_ARCH}
 
 # === BAKE BROWSERS INTO IMAGE ===