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

ramackri pushed a commit to branch ranger-2.9
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/ranger-2.9 by this push:
     new 5d3f1a880 RANGER-5640: Bump Docker Ozone to 2.1
5d3f1a880 is described below

commit 5d3f1a880dcf347317a01486a1bde46c23a06e48
Author: ramk <[email protected]>
AuthorDate: Wed Jul 29 08:42:36 2026 +0530

    RANGER-5640: Bump Docker Ozone to 2.1
    
    Backport Ozone 2.1 docker fixes for plugins-docker-build: jdk21 runner,
    explicit scm/om --init, and datanode /data chown on the jdk21 ozone-runner.
---
 dev-support/ranger-docker/.env                            |  3 ++-
 dev-support/ranger-docker/Dockerfile.ranger-ozone         |  5 +++--
 dev-support/ranger-docker/docker-compose.ranger-ozone.yml | 11 +++++------
 3 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 4db6300e3..30dd31be0 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -38,9 +38,10 @@ KERBEROS_MASTER_PASSWORD=rangerR0cks!
 KERBEROS_ADMIN_PRINCIPAL=admin/admin
 KERBEROS_ADMIN_PASSWORD=rangerR0cks!
 
+# Ozone 2.0+ requires jdk21 runner (jdk11/jdk17 tags are for Ozone 1.x). 
Multi-arch arm64+amd64.
 OZONE_VERSION=2.1.1
-OZONE_RUNNER_VERSION=20230615-1
 OZONE_RUNNER_IMAGE=apache/ozone-runner
+OZONE_RUNNER_VERSION=20260106-1-jdk21
 
 # versions of ranger services
 RANGER_VERSION=2.9.0
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-ozone 
b/dev-support/ranger-docker/Dockerfile.ranger-ozone
index 3c1f6ef6f..0e435e1f5 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-ozone
+++ b/dev-support/ranger-docker/Dockerfile.ranger-ozone
@@ -14,8 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ARG OZONE_RUNNER_IMAGE
-ARG OZONE_RUNNER_VERSION
+ARG OZONE_RUNNER_IMAGE=apache/ozone-runner
+# Keep in sync with .env; Ozone 2.0+ needs jdk21 runner (20260106-1-jdk21 is 
multi-arch arm64+amd64).
+ARG OZONE_RUNNER_VERSION=20260106-1-jdk21
 FROM ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
 
 ARG OZONE_HOME
diff --git a/dev-support/ranger-docker/docker-compose.ranger-ozone.yml 
b/dev-support/ranger-docker/docker-compose.ranger-ozone.yml
index 9b7aad5c6..99b2b6dfa 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-ozone.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-ozone.yml
@@ -9,7 +9,7 @@ services:
       - ranger
     ports:
       - 9864
-    command: ["/opt/hadoop/bin/ozone","datanode"]
+    command: bash -c "sudo mkdir -p /data/hdds /data/metadata && sudo chown -R 
hadoop:hadoop /data && exec /opt/hadoop/bin/ozone datanode"
     env_file:
       - ./scripts/ozone/docker-config
     environment:
@@ -40,14 +40,14 @@ services:
       ranger-solr:
         condition: service_started
     environment:
-      ENSURE_OM_INITIALIZED: /data/metadata/om/current/VERSION
-      OZONE_OPTS: -Dcom.sun.net.ssl.checkRevocation=false
+      OZONE_OPTS: -XX:-UseContainerSupport 
-Dcom.sun.net.ssl.checkRevocation=false
       OZONE_HOME: /opt/hadoop
       OZONE_PLUGIN_VERSION: ${OZONE_PLUGIN_VERSION}
       OZONE_VERSION: ${OZONE_VERSION}
     env_file:
       - ./scripts/ozone/docker-config
-    command: bash -c "/opt/hadoop/ranger-ozone-plugin/ranger-ozone-setup.sh && 
/opt/hadoop/bin/ozone om"
+    # Ozone 2.1 entrypoint init uses obsolete -createObjectStore fallback; use 
--init explicitly.
+    command: bash -c "/opt/hadoop/ranger-ozone-plugin/ranger-ozone-setup.sh && 
(test -f /data/metadata/om/current/VERSION || /opt/hadoop/bin/ozone om --init) 
&& exec /opt/hadoop/bin/ozone om"
   scm:
     image: ${OZONE_RUNNER_IMAGE}:${OZONE_RUNNER_VERSION}
     container_name: ozone-scm
@@ -62,10 +62,9 @@ services:
     env_file:
       - ./scripts/ozone/docker-config
     environment:
-      ENSURE_SCM_INITIALIZED: /data/metadata/scm/current/VERSION
       OZONE-SITE.XML_hdds.scm.safemode.min.datanode: 
"${OZONE_SAFEMODE_MIN_DATANODES:-1}"
       OZONE_OPTS:
-    command: ["/opt/hadoop/bin/ozone","scm"]
+    command: bash -c "(test -f /data/metadata/scm/current/VERSION || 
/opt/hadoop/bin/ozone scm --init) && exec /opt/hadoop/bin/ozone scm"
 
 networks:
   ranger:

Reply via email to