From 083af5d198639552d1a8b42d053967be64f041ac Mon Sep 17 00:00:00 2001
From: Michael Keller <github@ike.ch>
Date: Thu, 26 Sep 2024 21:38:52 +1200
Subject: [PATCH] Update android docker image.

Signed-off-by: Michael Keller <github@ike.ch>
---
 .github/workflows/android-dockerimage.yml         | 2 +-
 scripts/docker/android-build-container/Dockerfile | 9 ++++-----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/android-dockerimage.yml b/.github/workflows/android-dockerimage.yml
index 73919e55164..1c05f86eea9 100644
--- a/.github/workflows/android-dockerimage.yml
+++ b/.github/workflows/android-dockerimage.yml
@@ -12,7 +12,7 @@ jobs:
   android-build-container:
     runs-on: ubuntu-latest
     env:
-      VERSION: ${{ '5.15.2' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
+      VERSION: ${{ '5.15.3' }} # the version numbers here is based on the Qt version, the third digit is the rev of the docker image
 
     steps:
     - uses: actions/checkout@v4
diff --git a/scripts/docker/android-build-container/Dockerfile b/scripts/docker/android-build-container/Dockerfile
index b4295987122..3e17b4cb930 100644
--- a/scripts/docker/android-build-container/Dockerfile
+++ b/scripts/docker/android-build-container/Dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:22.04 as base
+FROM ubuntu:24.04 as base
 
 RUN apt-get update  && \
     apt-get dist-upgrade -y && \
@@ -8,7 +8,7 @@ RUN apt-get update  && \
     cmake \
     autoconf \
     libtool-bin \
-    openjdk-8-jdk \
+    openjdk-17-jdk \
     wget && \
     apt-get clean
 
@@ -22,7 +22,7 @@ COPY --from=subsurface/android-build-container:5.15.1 /android/5.15.1 5.15.1
 
 # install, NDK and SDK there, plus the three files from the Subsurface
 # sources that we need to get the prep routines to run
-RUN wget https://dl.google.com/android/repository/commandlinetools-linux-6858069_latest.zip && \
+RUN wget https://dl.google.com/android/repository/commandlinetools-linux-11076708_latest.zip && \
     unzip commandlinetools-linux-*.zip
 ADD android-build-setup.sh variables.sh .
 
@@ -83,9 +83,8 @@ RUN apt-get install -y \
     bzip2 \
     pkg-config \
     libx11-xcb1 \
-    libgl1-mesa-glx \
     libglib2.0-0 \
-    openjdk-8-jdk \
+    openjdk-17-jdk \
     curl \
     coreutils \
     p7zip-full && \