From 7907a0d52410bb93e703b4c0c58b4dcfb0779c11 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhi@apache.org>
Date: Wed, 5 Aug 2026 08:08:08 -0700
Subject: [PATCH 1/2] Upgrade OS to Ubuntu 26.04 LTS, comes with Python 3.14

---
 docker/Dockerfile | 21 +++++++++------------
 1 file changed, 9 insertions(+), 12 deletions(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 6fd4e72..3f955c9 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -17,35 +17,32 @@
 # see https://hub.docker.com/_/eclipse-temurin/tags
 ARG RANGER_BASE_JAVA_VERSION=8
 
-# Ubuntu 22.04 LTS
-FROM eclipse-temurin:${RANGER_BASE_JAVA_VERSION}-jdk-jammy
+# Ubuntu 26.04 LTS
+FROM eclipse-temurin:${RANGER_BASE_JAVA_VERSION}-jdk-resolute
 
-# Install packages
 RUN apt update -q \
     && DEBIAN_FRONTEND="noninteractive" apt install -y --no-install-recommends \
         bc \
         curl \
         iputils-ping \
         pdsh \
-        python3 \
-        python3-pip \
-        python-is-python3 \
         ssh \
         tzdata \
         vim \
         xmlstarlet \
         krb5-user \
-    && apt clean
-
-# Install Python modules
-RUN pip install apache-ranger requests \
-    && rm -rf ~/.cache/pip
+        python3-venv \
+    &&  apt clean \
+    && rm -rf /var/lib/apt/lists/*
 
 # Set environment variables
 ENV RANGER_DIST=/home/ranger/dist
 ENV RANGER_SCRIPTS=/home/ranger/scripts
 ENV RANGER_HOME=/opt/ranger
-ENV PATH=/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
+ENV PATH="${JAVA_HOME}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/venv/bin"
+
+RUN python3 -m venv /opt/venv
+RUN /opt/venv/bin/pip install apache-ranger
 
 # create directories and setup perms
 RUN mkdir -p ${RANGER_DIST} ${RANGER_SCRIPTS} ${RANGER_HOME} && \

From ab805e71865ab82fb37833df0c2e71047a9adee3 Mon Sep 17 00:00:00 2001
From: Abhishek Kumar <abhi@apache.org>
Date: Wed, 5 Aug 2026 14:06:09 -0700
Subject: [PATCH 2/2] Put venv first to correctly locate apache-ranger python
 client

---
 docker/Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/docker/Dockerfile b/docker/Dockerfile
index 3f955c9..e7c3f79 100644
--- a/docker/Dockerfile
+++ b/docker/Dockerfile
@@ -39,7 +39,7 @@ RUN apt update -q \
 ENV RANGER_DIST=/home/ranger/dist
 ENV RANGER_SCRIPTS=/home/ranger/scripts
 ENV RANGER_HOME=/opt/ranger
-ENV PATH="${JAVA_HOME}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/venv/bin"
+ENV PATH="/opt/venv/bin:${JAVA_HOME}/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
 
 RUN python3 -m venv /opt/venv
 RUN /opt/venv/bin/pip install apache-ranger