diff options
| author | Albin <albin@mullvad.net> | 2023-08-02 11:58:42 +0200 |
|---|---|---|
| committer | Albin <albin@mullvad.net> | 2023-08-02 11:58:42 +0200 |
| commit | cffc172f0b2fa135a018f6384540847c5a9763bb (patch) | |
| tree | ed7554661fb111a85f207b7698cf63f2a37115b5 | |
| parent | 771bb16aa0f77bd0294fd00ee91eccabaf20cc5a (diff) | |
| parent | 57974af53f1e2659ce3e64dedb54f5cf0ec68383 (diff) | |
| download | mullvadvpn-cffc172f0b2fa135a018f6384540847c5a9763bb.tar.xz mullvadvpn-cffc172f0b2fa135a018f6384540847c5a9763bb.zip | |
Merge branch 'bump-container-to-jdk-17-droid-239'
| -rw-r--r-- | android/docker/Dockerfile | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/android/docker/Dockerfile b/android/docker/Dockerfile index e8a7337586..908474ba8a 100644 --- a/android/docker/Dockerfile +++ b/android/docker/Dockerfile @@ -76,13 +76,14 @@ RUN apt-get update -y && apt-get install -y \ python \ software-properties-common \ unzip \ - openjdk-11-jdk \ + ca-certificates-java \ + openjdk-17-jdk \ tidy \ && rm -rf /var/lib/apt/lists/* # Set default java version -RUN update-alternatives --set java /usr/lib/jvm/java-11-openjdk-amd64/bin/java -RUN update-alternatives --set javac /usr/lib/jvm/java-11-openjdk-amd64/bin/javac +RUN update-alternatives --set java /usr/lib/jvm/java-17-openjdk-amd64/bin/java +RUN update-alternatives --set javac /usr/lib/jvm/java-17-openjdk-amd64/bin/javac # Install Android command line tools RUN curl -sfLo /tmp/cmdline-tools.zip https://dl.google.com/android/repository/commandlinetools-linux-${COMMAND_LINE_TOOLS_VERSION}_latest.zip && \ |