This is an automated email from the ASF dual-hosted git repository.

potiuk pushed a commit to branch hardened-python-base-images
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit 1b62d71e5be1507e2f2a2672e804555678bb2564
Author: Jarek Potiuk <[email protected]>
AuthorDate: Sat Oct 10 22:36:07 2026 +0100

    Install Java that exists on trixie in the Java examples
    
    Debian trixie ships no Java 17. The Java SDK e2e image keeps Java 17 for 
Spark 3.5 by taking it from the Temurin repository, and the docs example uses 
trixie's Java 21.
    
    Generated-by: Claude Opus 5
    Claude-Session: https://claude.ai/code/session_014np1fVAxHmGaBFt3qebJ8x
---
 airflow-e2e-tests/docker/Dockerfile.java                     | 12 ++++++++++--
 .../docker-examples/extending/add-providers/Dockerfile       |  4 ++--
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/airflow-e2e-tests/docker/Dockerfile.java 
b/airflow-e2e-tests/docker/Dockerfile.java
index 68ccff525a3..df89a355e00 100644
--- a/airflow-e2e-tests/docker/Dockerfile.java
+++ b/airflow-e2e-tests/docker/Dockerfile.java
@@ -19,12 +19,20 @@
 # can spawn JVM subprocesses for @task.stub tasks.
 #
 # Pin Java 17 (rather than default-jre-headless): the Scala Spark example runs
-# Apache Spark 3.5.x, which supports Java 8/11/17 but not Java 21.
+# Apache Spark 3.5.x, which supports Java 8/11/17 but not Java 21. Debian 
trixie ships
+# no Java 17, so it comes from the Eclipse Temurin (Adoptium) repository.
 ARG DOCKER_IMAGE
 FROM ${DOCKER_IMAGE}
 
 USER root
 RUN apt-get update \
-    && apt-get install -y --no-install-recommends openjdk-17-jre-headless \
+    && apt-get install -y --no-install-recommends ca-certificates curl \
+    && mkdir -p /etc/apt/keyrings \
+    && curl -fsSL --retry 3 
https://packages.adoptium.net/artifactory/api/gpg/key/public \
+        -o /etc/apt/keyrings/adoptium.asc \
+    && echo "deb [signed-by=/etc/apt/keyrings/adoptium.asc] 
https://packages.adoptium.net/artifactory/deb \
+$(. /etc/os-release && echo "${VERSION_CODENAME}") main" > 
/etc/apt/sources.list.d/adoptium.list \
+    && apt-get update \
+    && apt-get install -y --no-install-recommends temurin-17-jre \
     && rm -rf /var/lib/apt/lists/*
 USER airflow
diff --git 
a/docker-stack-docs/docker-examples/extending/add-providers/Dockerfile 
b/docker-stack-docs/docker-examples/extending/add-providers/Dockerfile
index d1eedfcb6c6..bcdf0b73bf6 100644
--- a/docker-stack-docs/docker-examples/extending/add-providers/Dockerfile
+++ b/docker-stack-docs/docker-examples/extending/add-providers/Dockerfile
@@ -21,11 +21,11 @@ FROM apache/airflow:3.4.0
 USER root
 RUN apt-get update \
   && apt-get install -y --no-install-recommends \
-         openjdk-17-jre-headless \
+         openjdk-21-jre-headless \
   && apt-get autoremove -yqq --purge \
   && apt-get clean \
   && rm -rf /var/lib/apt/lists/*
 USER airflow
-ENV JAVA_HOME=/usr/lib/jvm/java-17-openjdk-amd64
+ENV JAVA_HOME=/usr/lib/jvm/java-21-openjdk-amd64
 RUN pip install --no-cache-dir "apache-airflow==${AIRFLOW_VERSION}" 
apache-airflow-providers-apache-spark==5.1.1
 # [END Dockerfile]

Reply via email to