Merge pull request #878 from cmizzi/patch-1

[1.22] Update Dockerfile to use JDK 17

Author: OlegNitz

Dockerfile

@@ -2,10 +2,14 @@ FROM node:18-bullseye
 
 RUN npm install -g svg2img @bubblewrap/cli
 
-RUN apt update && apt install -y openjdk-11-jre openjdk-11-jdk lib32stdc++6 lib32z1
+RUN set -xe \
+  && apt update \
+  && apt install -y openjdk-17-jre openjdk-17-jdk lib32stdc++6 lib32z1 \
+  && rm -rf /var/lib/apt/lists/*
 
-RUN mkdir -p /root/.bubblewrap && \
-  echo '{ "jdkPath": "/usr/lib/jvm/java-11-openjdk-amd64", "androidSdkPath": "" }' > /root/.bubblewrap/config.json
+RUN set -xe \
+  && mkdir -p /root/.bubblewrap \
+  && echo '{ "jdkPath": "/usr/lib/jvm/java-17-openjdk-amd64", "androidSdkPath": "" }' > /root/.bubblewrap/config.json
 
 RUN yes | bubblewrap doctor
 

packages/cli/README.md

@@ -464,7 +464,7 @@ Information on the signature fingerprints for the application. Use to generate t
 
 ## Manually setting up the Environment
 
-### Get the Java Development Kit (JDK) 11.
+### Get the Java Development Kit (JDK) 17.
 The Android Command line tools requires the correct version of the JDK to run. To prevent version
 conflicts with a JDK version that is already installed, Bubblewrap uses a JDK that can unzipped in
 a separate folder.