summaryrefslogtreecommitdiff
path: root/docker
diff options
context:
space:
mode:
authorcyberta <cyberta@riseup.net>2026-03-14 03:08:29 +0100
committercyberta <cyberta@riseup.net>2026-03-16 11:08:57 +0000
commit951869f108025c520cbeee26f9a570a81b405384 (patch)
tree3bd7f6da7ba50227650457fb41e2452479d416f4 /docker
parentac7ad859a0835b63ccffb32474af60c89533870d (diff)
install jdk21 in Debian bookworm Android SDK image
Diffstat (limited to 'docker')
-rw-r--r--docker/android-ndk/Dockerfile1
-rw-r--r--docker/android-sdk/Dockerfile10
2 files changed, 10 insertions, 1 deletions
diff --git a/docker/android-ndk/Dockerfile b/docker/android-ndk/Dockerfile
index 07ccc010..6a4e8fd8 100644
--- a/docker/android-ndk/Dockerfile
+++ b/docker/android-ndk/Dockerfile
@@ -70,3 +70,4 @@ RUN curl -L -o "go.tar.gz" "https://golang.org/dl/${GO_VERSION}.tar.gz"; \
tar -C /usr/local -xzf go.tar.gz && \
rm go.tar.gz \
+
diff --git a/docker/android-sdk/Dockerfile b/docker/android-sdk/Dockerfile
index fd35be0c..2eef0cb6 100644
--- a/docker/android-sdk/Dockerfile
+++ b/docker/android-sdk/Dockerfile
@@ -24,11 +24,19 @@ RUN apt-get update -qq && \
# the basics
curl unzip git locales \
# java stuff \
- openjdk-21-jdk maven && \
+ maven && \
apt-get clean && \
apt-get autoclean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+ENV JAVA_PKG=https://download.oracle.com/java/21/archive/jdk-21.0.8_linux-x64_bin.tar.gz \
+ JAVA_HOME=/usr/java/jdk-21
+RUN set -eux; \
+ JAVA_SHA256=d87272944278713fc7a120cf024d2818d136b5debc750aa17045e3c6f045b867 ; \
+ curl --output /tmp/jdk.tgz "$JAVA_PKG" && \
+ echo "$JAVA_SHA256 */tmp/jdk.tgz" | sha256sum -c; \
+ mkdir -p "$JAVA_HOME"; \
+ tar --extract --file /tmp/jdk.tgz --directory "$JAVA_HOME" --strip-components 1
# ------------------------------------------------------
# --- Set Locales