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

abhi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/ranger.git


The following commit(s) were added to refs/heads/master by this push:
     new 7831f6cd5 RANGER-5241: Update all docker images to use 
apache/ranger-base from DockerHub (#601)
7831f6cd5 is described below

commit 7831f6cd5e729386e88deb34b84c15897bc2e438
Author: Abhishek Kumar <[email protected]>
AuthorDate: Fri Jul 11 11:46:49 2025 -0700

    RANGER-5241: Update all docker images to use apache/ranger-base from 
DockerHub (#601)
---
 .github/workflows/ci.yml                           |  3 -
 dev-support/ranger-docker/.env                     | 32 ++-------
 dev-support/ranger-docker/Dockerfile.ranger        | 11 +--
 dev-support/ranger-docker/Dockerfile.ranger-base   | 63 ----------------
 .../ranger-docker/Dockerfile.ranger-base-ubi       | 84 ----------------------
 dev-support/ranger-docker/Dockerfile.ranger-build  | 17 ++---
 dev-support/ranger-docker/Dockerfile.ranger-hadoop |  9 ++-
 dev-support/ranger-docker/Dockerfile.ranger-hbase  |  9 ++-
 dev-support/ranger-docker/Dockerfile.ranger-hive   |  4 +-
 dev-support/ranger-docker/Dockerfile.ranger-kafka  |  4 +-
 dev-support/ranger-docker/Dockerfile.ranger-kms    | 17 ++---
 dev-support/ranger-docker/Dockerfile.ranger-knox   |  4 +-
 .../ranger-docker/Dockerfile.ranger-tagsync        | 10 ++-
 .../ranger-docker/Dockerfile.ranger-usersync       |  9 ++-
 dev-support/ranger-docker/README.md                | 37 +++++-----
 .../docker-compose.ranger-base-ubi.yml             | 18 -----
 .../ranger-docker/docker-compose.ranger-base.yml   | 18 -----
 .../ranger-docker/docker-compose.ranger-build.yml  |  5 +-
 .../ranger-docker/docker-compose.ranger-hadoop.yml |  2 +
 .../ranger-docker/docker-compose.ranger-hbase.yml  |  2 +
 .../ranger-docker/docker-compose.ranger-hive.yml   |  2 +
 .../ranger-docker/docker-compose.ranger-kafka.yml  |  2 +
 .../ranger-docker/docker-compose.ranger-kms.yml    |  2 +
 .../ranger-docker/docker-compose.ranger-knox.yml   |  2 +
 .../docker-compose.ranger-tagsync.yml              |  2 +
 .../docker-compose.ranger-usersync.yml             |  2 +
 .../ranger-docker/docker-compose.ranger.yml        |  3 +-
 dev-support/ranger-docker/scripts/ranger-hadoop.sh | 11 +--
 dev-support/ranger-docker/scripts/ranger-hbase.sh  | 12 +---
 ranger_in_docker                                   | 38 ++--------
 30 files changed, 105 insertions(+), 329 deletions(-)

diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 34dae302d..ea1781ed4 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -137,9 +137,6 @@ jobs:
       - name: Build all ranger-service images
         run: |
           cd dev-support/ranger-docker
-          docker compose -f docker-compose.ranger-base.yml build
-          export DOCKER_BUILDKIT=1
-          export COMPOSE_DOCKER_CLI_BUILD=1
           export RANGER_DB_TYPE=postgres
           docker compose \
           -f docker-compose.ranger.yml \
diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 463b05f09..e6de538a2 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -5,32 +5,12 @@ BRANCH=master
 PROFILE=
 BUILD_OPTS=
 
-# To build Trino plugins package, use following PROFILE
-# PROFILE=ranger-jdk11,!all,!linux
-
-# Java version for RangerBase ubuntu image.
-# This image gets used as base docker image for all images.
-# Valid values: 8, 11, 17
-RANGER_BASE_JAVA_VERSION=8
-
-# Java version for RangerBase ubi image.
-# This image gets used as base docker image for all images.
-# Valid values: 1.8.0, 11, 17
-RANGER_BASE_UBI_JAVA_VERSION=1.8.0
-
-# Java version to use to build Apache Ranger
-# Valid values: 8, 11, 17
-# Trino builds on jdk 11 and above
-RANGER_BUILD_JAVA_VERSION=8
-
-# Java version to use to run Ranger Admin server
-# Valid values: 8, 11, 17
-# Should be same as RANGER_BASE_UBI_JAVA_VERSION when running on UBI BASE 
image.
-RANGER_ADMIN_JAVA_VERSION=8
-
-# base image versions
-UBUNTU_VERSION=22.04
-UBI_VERSION=latest
+# DockerHub Ranger Base Image
+RANGER_BASE_IMAGE=apache/ranger-base
+# Java version used to run Ranger and dependent services is present as suffix: 
-8, valid values for suffix: -8, -11, -17
+RANGER_BASE_VERSION=20250707-1-8
+# Java version used to build Apache Ranger is present as suffix: -8, valid 
values for suffix: -8, -11, -17
+RANGER_BASE_BUILD_VERSION=20250707-1-8
 
 # third party image versions
 MARIADB_VERSION=10.7.3
diff --git a/dev-support/ranger-docker/Dockerfile.ranger 
b/dev-support/ranger-docker/Dockerfile.ranger
index 5efc801da..b6dcff30a 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger
+++ b/dev-support/ranger-docker/Dockerfile.ranger
@@ -14,19 +14,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG RANGER_DB_TYPE
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
 
-FROM ranger-base:latest AS ranger
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION} AS ranger
 
 ARG RANGER_VERSION
 ARG RANGER_DB_TYPE
 ARG TARGETARCH
-ARG RANGER_ADMIN_JAVA_VERSION
-
-ENV 
JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_ADMIN_JAVA_VERSION}.0-openjdk-${TARGETARCH}
-
-RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
-    update-java-alternatives --set "$JAVA_HOME";\
-    fi
 
 COPY ./dist/version                               /home/ranger/dist/
 COPY ./dist/ranger-${RANGER_VERSION}-admin.tar.gz /home/ranger/dist/
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-base 
b/dev-support/ranger-docker/Dockerfile.ranger-base
deleted file mode 100644
index 0dfd9d0be..000000000
--- a/dev-support/ranger-docker/Dockerfile.ranger-base
+++ /dev/null
@@ -1,63 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ARG UBUNTU_VERSION
-FROM ubuntu:${UBUNTU_VERSION}
-
-ARG TARGETARCH
-ARG RANGER_BASE_JAVA_VERSION
-ENV OS_NAME=UBUNTU
-
-# Install tzdata, Python, Java, python-requests
-RUN apt-get update && \
-    DEBIAN_FRONTEND="noninteractive" apt-get -y install tzdata vim\
-    python3 python3-pip openjdk-8-jdk openjdk-11-jdk openjdk-17-jdk bc 
iputils-ping ssh pdsh xmlstarlet && \
-    pip3 install apache-ranger && \
-    pip3 install requests
-
-# Set environment variables
-ENV 
JAVA_HOME=/usr/lib/jvm/java-${RANGER_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
-ENV RANGER_DIST=/home/ranger/dist
-ENV RANGER_SCRIPTS=/home/ranger/scripts
-ENV RANGER_HOME=/opt/ranger
-ENV 
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-RUN update-java-alternatives --set 
/usr/lib/jvm/java-1.${RANGER_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH}
-
-# setup groups, users, directories
-RUN groupadd ranger && \
-    useradd -g ranger -ms /bin/bash ranger && \
-    useradd -g ranger -ms /bin/bash rangeradmin && \
-    useradd -g ranger -ms /bin/bash rangerusersync && \
-    useradd -g ranger -ms /bin/bash rangertagsync && \
-    useradd -g ranger -ms /bin/bash rangerkms && \
-    groupadd hadoop && \
-    useradd -g hadoop -ms /bin/bash hdfs && \
-    useradd -g hadoop -ms /bin/bash yarn && \
-    useradd -g hadoop -ms /bin/bash hive && \
-    useradd -g hadoop -ms /bin/bash hbase && \
-    useradd -g hadoop -ms /bin/bash kafka && \
-    useradd -g hadoop -ms /bin/bash ozone && \
-    groupadd knox && \
-    useradd -g knox -ms /bin/bash knox && \
-    mkdir -p /home/ranger/dist && \
-    mkdir -p /home/ranger/scripts && \
-    chown -R ranger:ranger /home/ranger && \
-    chmod +rx /home/ranger /home/ranger/dist /home/ranger/scripts && \
-    mkdir -p /opt/ranger && \
-    chown -R ranger:ranger /opt/ranger
-
-ENTRYPOINT [ "/bin/bash" ]
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-base-ubi 
b/dev-support/ranger-docker/Dockerfile.ranger-base-ubi
deleted file mode 100644
index ad107f128..000000000
--- a/dev-support/ranger-docker/Dockerfile.ranger-base-ubi
+++ /dev/null
@@ -1,84 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-ARG UBI_VERSION
-FROM registry.access.redhat.com/ubi9/ubi-minimal:${UBI_VERSION}
-
-USER root
-ARG RANGER_BASE_UBI_JAVA_VERSION
-ENV OS_NAME=RHEL
-
-RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
-    install -y java-${RANGER_BASE_UBI_JAVA_VERSION}-openjdk-devel \
-    && microdnf clean all \
-    && rpm -q java-${RANGER_BASE_UBI_JAVA_VERSION}-openjdk-devel
-
-ENV JAVA_HOME="/usr/lib/jvm/java-${RANGER_BASE_UBI_JAVA_VERSION}" \
-    JAVA_VENDOR="openjdk" \
-    JAVA_VERSION="${RANGER_BASE_UBI_JAVA_VERSION}" \
-    JBOSS_CONTAINER_OPENJDK_JDK_MODULE="/opt/jboss/container/openjdk/jdk"
-
-# Install tzdata, Python, python-requests
-RUN microdnf install -y python3 python3-pip bc iputils hostname
-RUN microdnf install -y tar
-RUN microdnf install -y gzip
-RUN microdnf install -y procps
-RUN microdnf install -y vim
-
-# for command useradd, groupadd
-RUN microdnf install -y shadow-utils
-
-# for command su
-RUN microdnf install -y util-linux-user
-RUN microdnf install -y sudo
-
-# for command service
-RUN microdnf install -y initscripts
-RUN microdnf install -y openssh-clients
-RUN microdnf install -y openssh-server
-RUN microdnf install -y wget
-RUN pip3 install apache-ranger
-
-# Set environment variables
-ENV RANGER_HOME=/opt/ranger
-ENV RANGER_DIST=/home/ranger/dist
-ENV RANGER_SCRIPTS=/home/ranger/scripts
-ENV 
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
-
-RUN sudo sed -i 's/^HOME_MODE.*/HOME_MODE 0755/' /etc/login.defs
-
-# setup groups, users, directories
-RUN groupadd ranger \
-    && groupadd knox \
-    && groupadd hadoop \
-    && useradd -g ranger -ms /bin/bash ranger \
-    && useradd -g ranger -ms /bin/bash rangeradmin \
-    && useradd -g ranger -ms /bin/bash rangerusersync \
-    && useradd -g ranger -ms /bin/bash rangertagsync \
-    && useradd -g ranger -ms /bin/bash rangerkms \
-    && useradd -g knox -ms /bin/bash knox \
-    && useradd -g hadoop -ms /bin/bash hdfs \
-    && useradd -g hadoop -ms /bin/bash yarn \
-    && useradd -g hadoop -ms /bin/bash hive \
-    && useradd -g hadoop -ms /bin/bash hbase \
-    && useradd -g hadoop -ms /bin/bash kafka \
-    && mkdir -p /home/ranger/dist \
-    && mkdir -p /home/ranger/scripts \
-    && chown -R ranger:ranger /home/ranger \
-    && mkdir -p /opt/ranger \
-    && chown -R ranger:ranger /opt/ranger
-
-ENTRYPOINT [ "/bin/bash" ]
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-build 
b/dev-support/ranger-docker/Dockerfile.ranger-build
index 1f112cb17..ad09ab1c6 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-build
+++ b/dev-support/ranger-docker/Dockerfile.ranger-build
@@ -14,20 +14,18 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_BUILD_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_BUILD_VERSION}
 
-ARG RANGER_BUILD_JAVA_VERSION
 ARG TARGETARCH
 
-ENV 
JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}
-
 # Install necessary packages to build Ranger
-RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
-    apt-get update && apt-get -y install git maven build-essential;\
-    update-java-alternatives --set "$JAVA_HOME";\
+RUN if grep -i ubuntu /etc/os-release; then\
+    apt-get update && apt-get -y install --no-install-recommends git maven 
build-essential;\
     fi
 
-RUN if [ "${OS_NAME}" = "RHEL" ]; then\
+RUN if grep -i rhel /etc/os-release; then\
     microdnf install -y git maven gcc;\
     fi
 
@@ -36,8 +34,7 @@ ENV MAVEN_HOME=/usr/share/maven
 ENV 
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
 
 # setup ranger group, and users
-RUN mkdir -p /home/ranger/git && \
-    mkdir -p /home/ranger/.m2 && \
+RUN mkdir -p /home/ranger/git /home/ranger/.m2 && \
        chown -R ranger:ranger /home/ranger
 
 COPY ./scripts/ranger-build.sh /home/ranger/scripts/
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hadoop 
b/dev-support/ranger-docker/Dockerfile.ranger-hadoop
index 5f64e9fc3..5fc455e4b 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hadoop
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hadoop
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG HADOOP_VERSION
 ARG HDFS_PLUGIN_VERSION
@@ -46,6 +48,11 @@ RUN tar xvfz 
/home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/
     chmod 744 ${RANGER_SCRIPTS}/ranger-hadoop-setup.sh 
${RANGER_SCRIPTS}/ranger-hadoop.sh ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh && \
     chown hdfs:hadoop ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends openssh-server && \
+    mkdir -p /var/run/sshd && \
+    rm -rf /var/lib/apt/lists/*
+
 ENV HADOOP_HOME=/opt/hadoop
 ENV HADOOP_CONF_DIR=/opt/hadoop/etc/hadoop
 ENV HADOOP_HDFS_HOME=/opt/hadoop
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hbase 
b/dev-support/ranger-docker/Dockerfile.ranger-hbase
index cb4d67111..0d0120079 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hbase
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hbase
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG HBASE_VERSION
 ARG HBASE_PLUGIN_VERSION
@@ -38,6 +40,11 @@ RUN tar xvfz 
/home/ranger/dist/hbase-${HBASE_VERSION}-bin.tar.gz --directory=/op
     cp -f /home/ranger/scripts/ranger-hbase-plugin-install.properties 
/opt/ranger/ranger-hbase-plugin/install.properties && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-hbase-setup.sh 
${RANGER_SCRIPTS}/ranger-hbase.sh
 
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends openssh-server && \
+    mkdir -p /var/run/sshd && \
+    rm -rf /var/lib/apt/lists/*
+
 ENV HBASE_HOME=/opt/hbase
 ENV 
PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hbase/bin
 
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hive 
b/dev-support/ranger-docker/Dockerfile.ranger-hive
index e8baa6872..7fddfc001 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hive
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hive
@@ -15,7 +15,9 @@
 # limitations under the License.
 ARG RANGER_DB_TYPE
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG HIVE_VERSION
 ARG HIVE_HADOOP_VERSION
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-kafka 
b/dev-support/ranger-docker/Dockerfile.ranger-kafka
index aa9b462f5..48c5789a7 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-kafka
+++ b/dev-support/ranger-docker/Dockerfile.ranger-kafka
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG KAFKA_VERSION
 ARG KAFKA_PLUGIN_VERSION
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-kms 
b/dev-support/ranger-docker/Dockerfile.ranger-kms
index be85bbcff..55401ef60 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-kms
+++ b/dev-support/ranger-docker/Dockerfile.ranger-kms
@@ -14,14 +14,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 ARG RANGER_DB_TYPE
-
-FROM ranger-base:latest AS ranger-kms
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION} AS ranger-kms
 
 ARG KMS_VERSION
 ARG RANGER_DB_TYPE
 
-COPY ./dist/version                             /home/ranger/dist/
-COPY ./dist/ranger-${KMS_VERSION}-kms.tar.gz /home/ranger/dist/
+COPY ./dist/version                                            
/home/ranger/dist/
+COPY ./dist/ranger-${KMS_VERSION}-kms.tar.gz                   
/home/ranger/dist/
 
 COPY ./scripts/ranger-kms.sh                                   
${RANGER_SCRIPTS}/
 COPY ./scripts/ranger-kms-install-${RANGER_DB_TYPE}.properties 
${RANGER_SCRIPTS}/ranger-kms-install.properties
@@ -29,20 +30,16 @@ COPY 
./scripts/ranger-kms-install-${RANGER_DB_TYPE}.properties ${RANGER_SCRIPTS}
 RUN tar xvfz /home/ranger/dist/ranger-${KMS_VERSION}-kms.tar.gz 
--directory=${RANGER_HOME} && \
     ln -s ${RANGER_HOME}/ranger-${KMS_VERSION}-kms ${RANGER_HOME}/kms && \
     rm -f /home/ranger/dist/ranger-${KMS_VERSION}-kms.tar.gz && \
+    mkdir -p /var/run/ranger_kms /var/log/ranger/kms /etc/ranger 
/usr/share/java/ && \
     cp -f ${RANGER_SCRIPTS}/ranger-kms-install.properties 
${RANGER_HOME}/kms/install.properties && \
-    mkdir -p /var/run/ranger_kms && \
-    mkdir -p /var/log/ranger/kms && \
-    mkdir -p /etc/ranger && \
     touch /etc/init.d/ranger-kms && \
-    ln -s /usr/bin/python3 /usr/bin/python && \
     ln -s /etc/init.d/ranger-kms /etc/rc2.d/S88ranger-kms && \
     ln -s /etc/init.d/ranger-kms /etc/rc2.d/K90ranger-kms && \
     ln -s /etc/init.d/ranger-kms /etc/rc3.d/S88ranger-kms && \
     ln -s /etc/init.d/ranger-kms /etc/rc3.d/K90ranger-kms && \
     ln -s ${RANGER_HOME}/kms/ranger-kms-services.sh 
/usr/bin/ranger-kms-services.sh && \
     chown -R rangerkms:ranger ${RANGER_HOME}/kms/ ${RANGER_SCRIPTS}/ 
/var/run/ranger_kms/ /var/log/ranger/ && \
-    chmod 744 ${RANGER_SCRIPTS}/ranger-kms.sh && \
-    mkdir -p /usr/share/java/
+    chmod 744 ${RANGER_SCRIPTS}/ranger-kms.sh
 
 FROM ranger-kms AS ranger_postgres
 COPY ./downloads/postgresql-42.2.16.jre7.jar          /home/ranger/dist/
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-knox 
b/dev-support/ranger-docker/Dockerfile.ranger-knox
index fe120cd2b..653af09ee 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-knox
+++ b/dev-support/ranger-docker/Dockerfile.ranger-knox
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG KNOX_VERSION
 ARG KNOX_PLUGIN_VERSION
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-tagsync 
b/dev-support/ranger-docker/Dockerfile.ranger-tagsync
index 6e41ae808..59efb40eb 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-tagsync
+++ b/dev-support/ranger-docker/Dockerfile.ranger-tagsync
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG TAGSYNC_VERSION
 
@@ -28,13 +30,9 @@ COPY ./scripts/ranger-tagsync-tags.json              
${RANGER_SCRIPTS}/
 RUN tar xvfz /home/ranger/dist/ranger-${TAGSYNC_VERSION}-tagsync.tar.gz 
--directory=${RANGER_HOME} && \
     ln -s ${RANGER_HOME}/ranger-${TAGSYNC_VERSION}-tagsync 
${RANGER_HOME}/tagsync && \
     rm -f /home/ranger/dist/ranger-${TAGSYNC_VERSION}-tagsync.tar.gz && \
-    mkdir -p /opt/ranger/tagsync/data && \
+    mkdir -p /opt/ranger/tagsync/data /var/run/ranger /var/log/ranger/tagsync 
/etc/ranger && \
     cp -f ${RANGER_SCRIPTS}/ranger-tagsync-install.properties 
${RANGER_HOME}/tagsync/install.properties && \
     cp -f ${RANGER_SCRIPTS}/ranger-tagsync-tags.json 
${RANGER_HOME}/tagsync/data/tags.json && \
-    mkdir -p /var/run/ranger && \
-    mkdir -p /var/log/ranger/tagsync && \
-    ln -s /usr/bin/python3 /usr/bin/python && \
-    mkdir -p /etc/ranger && \
     mkdir /etc/init.d || true && \
     mkdir /etc/rc2.d  || true && \
     mkdir /etc/rc3.d  || true && \
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-usersync 
b/dev-support/ranger-docker/Dockerfile.ranger-usersync
index c1bfe9289..9b164cad0 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-usersync
+++ b/dev-support/ranger-docker/Dockerfile.ranger-usersync
@@ -14,7 +14,9 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-FROM ranger-base:latest
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG USERSYNC_VERSION
 
@@ -29,10 +31,7 @@ RUN tar xvfz 
/home/ranger/dist/ranger-${USERSYNC_VERSION}-usersync.tar.gz --dire
     ln -s ${RANGER_HOME}/ranger-${USERSYNC_VERSION}-usersync 
${RANGER_HOME}/usersync && \
     rm -f /home/ranger/dist/ranger-${USERSYNC_VERSION}-usersync.tar.gz && \
     cp -f ${RANGER_SCRIPTS}/ranger-usersync-install.properties 
${RANGER_HOME}/usersync/install.properties && \
-    mkdir -p /var/run/ranger && \
-    mkdir -p /var/log/ranger/usersync && \
-    ln -s /usr/bin/python3 /usr/bin/python && \
-    mkdir -p /etc/ranger && \
+    mkdir -p /var/run/ranger /var/log/ranger/usersync /etc/ranger && \
     mkdir /etc/init.d || true && \
     mkdir /etc/rc2.d  || true && \
     mkdir /etc/rc3.d  || true && \
diff --git a/dev-support/ranger-docker/README.md 
b/dev-support/ranger-docker/README.md
index 05de7f839..1388ed351 100644
--- a/dev-support/ranger-docker/README.md
+++ b/dev-support/ranger-docker/README.md
@@ -23,7 +23,7 @@ Use Dockerfiles in this directory to create docker images and 
run them to build
 
 ### Environment Setup
 
-- Ensure that you have recent version of Docker installed from 
[docker.io](http://www.docker.io) (as of this writing: Engine 20.10.5, Compose 
1.28.5).
+- Ensure that you have recent version of Docker installed from 
[docker.io](http://www.docker.io) (as of this writing: Engine v24.0.5, Compose 
v2.20.2).
    Make sure to configure docker with at least 6gb of memory.
 
 - Update environment variables in ```.env``` file, if necessary
@@ -39,18 +39,21 @@ Use Dockerfiles in this directory to create docker images 
and run them to build
 
 - Execute following commands to set environment variables to build Apache 
Ranger docker containers:
    ~~~
-   export DOCKER_BUILDKIT=1
-   export COMPOSE_DOCKER_CLI_BUILD=1
    export RANGER_DB_TYPE=postgres
+  
+  # valid values for RANGER_DB_TYPE: mysql/postgres/oracle
    ~~~
 
 ### Apache Ranger Build
 
-#### In containers using docker-compose
+#### In containers using docker compose
 
 Execute following command to build Apache Ranger:
 ~~~
-docker-compose -f docker-compose.ranger-base.yml -f 
docker-compose.ranger-build.yml up
+# optional step: a fresh build ensures that the correct jdk version is used
+docker compose -f docker-compose.ranger-build.yml build
+
+docker compose -f docker-compose.ranger-build.yml up -d
 ~~~
 Time taken to complete the build might vary (upto an hour), depending on 
status of ```${HOME}/.m2``` directory cache.  
 
@@ -66,43 +69,35 @@ cp target/version dev-support/ranger-docker/dist/
 cd dev-support/ranger-docker
 ~~~
 
-### Docker Image Build
+### Run Ranger Services in Containers
 
-#### Prerequisite: ranger-base image build
-~~~
-# ubuntu base image:
-docker-compose -f docker-compose.ranger-base.yml build --no-cache
-# OR
-# ubi base image:
-docker-compose -f docker-compose.ranger-base-ubi.yml build --no-cache
-~~~
-#### Bring up ranger, usersync and tagsync containers
+#### Bring up ranger-core services: ranger, usersync, tagsync and ranger-kms 
in containers
 ~~~
 # To enable file based sync source for usersync do:
 # export ENABLE_FILE_SYNC_SOURCE=true
 
 # valid values for RANGER_DB_TYPE: mysql/postgres/oracle
 
-docker-compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml up -d
+docker compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml -f 
docker-compose.ranger-kms.yml up -d
 
 # Ranger Admin can be accessed at http://localhost:6080 (admin/rangerR0cks!)
 ~~~
 #### Bring up hive container
 ~~~
-docker-compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hive.yml up -d
+docker compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hive.yml up -d
 ~~~
 #### Bring up hbase container
 ~~~
-docker-compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hbase.yml up -d
+docker compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-hadoop.yml -f docker-compose.ranger-hbase.yml up -d
 ~~~
 #### Bring up ozone containers
 ~~~
 ./scripts/ozone-plugin-docker-setup.sh
-docker-compose -f docker-compose.ranger.yml -f docker-compose.ranger-ozone.yml 
up -d
+docker compose -f docker-compose.ranger.yml -f docker-compose.ranger-ozone.yml 
up -d
 ~~~
 #### Bring up trino container (requires docker build with jdk 11):
 ~~~
-docker-compose -f docker-compose.ranger.yml -f docker-compose.ranger-trino.yml 
up -d
+docker compose -f docker-compose.ranger.yml -f docker-compose.ranger-trino.yml 
up -d
 ~~~
 Similarly, check the `depends` section of the 
`docker-compose.ranger-service.yaml` file and add docker-compose files for 
these services when trying to bring up the `service` container.
 
@@ -114,5 +109,5 @@ docker compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-usersync.ym
           
 #### To rebuild specific images and start containers with the new image:
 ~~~
-docker-compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml -f 
docker-compose.ranger-kms.yml -f docker-compose.ranger-hadoop.yml -f 
docker-compose.ranger-hbase.yml -f docker-compose.ranger-kafka.yml -f 
docker-compose.ranger-hive.yml -f docker-compose.ranger-trino.yml -f 
docker-compose.ranger-knox.yml up -d --no-deps --force-recreate --build 
<service-1> <service-2>
+docker compose -f docker-compose.ranger.yml -f 
docker-compose.ranger-usersync.yml -f docker-compose.ranger-tagsync.yml -f 
docker-compose.ranger-kms.yml -f docker-compose.ranger-hadoop.yml -f 
docker-compose.ranger-hbase.yml -f docker-compose.ranger-kafka.yml -f 
docker-compose.ranger-hive.yml -f docker-compose.ranger-trino.yml -f 
docker-compose.ranger-knox.yml up -d --no-deps --force-recreate --build 
<service-1> <service-2>
 ~~~
diff --git a/dev-support/ranger-docker/docker-compose.ranger-base-ubi.yml 
b/dev-support/ranger-docker/docker-compose.ranger-base-ubi.yml
deleted file mode 100644
index 71989398e..000000000
--- a/dev-support/ranger-docker/docker-compose.ranger-base-ubi.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  ranger-base:
-    build:
-      context: .
-      dockerfile: Dockerfile.ranger-base-ubi
-      args:
-        - UBI_VERSION=${UBI_VERSION}
-        - RANGER_BASE_UBI_JAVA_VERSION=${RANGER_BASE_UBI_JAVA_VERSION}
-    image: ranger-base
-    container_name: ranger-base
-    networks:
-      - ranger
-    environment:
-      - RANGER_VERSION
-
-networks:
-  ranger:
-    name: rangernw
diff --git a/dev-support/ranger-docker/docker-compose.ranger-base.yml 
b/dev-support/ranger-docker/docker-compose.ranger-base.yml
deleted file mode 100644
index 6312bd968..000000000
--- a/dev-support/ranger-docker/docker-compose.ranger-base.yml
+++ /dev/null
@@ -1,18 +0,0 @@
-services:
-  ranger-base:
-    build:
-      context: .
-      dockerfile: Dockerfile.ranger-base
-      args:
-        - UBUNTU_VERSION=${UBUNTU_VERSION}
-        - RANGER_BASE_JAVA_VERSION=${RANGER_BASE_JAVA_VERSION}
-    image: ranger-base
-    container_name: ranger-base
-    networks:
-      - ranger
-    environment:
-      - RANGER_VERSION
-
-networks:
-  ranger:
-    name: rangernw
diff --git a/dev-support/ranger-docker/docker-compose.ranger-build.yml 
b/dev-support/ranger-docker/docker-compose.ranger-build.yml
index 9185f16c9..cfdd6a8c2 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-build.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-build.yml
@@ -4,7 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-build
       args:
-        - RANGER_BUILD_JAVA_VERSION=${RANGER_BUILD_JAVA_VERSION}
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_BUILD_VERSION=${RANGER_BASE_BUILD_VERSION}
     image: ranger-build
     container_name: ranger-build
     hostname: ranger-build.example.com
@@ -16,8 +17,6 @@ services:
       - ./patches:/home/ranger/patches
       - ./dist:/home/ranger/dist:delegated
       - ${RANGER_HOME:-./../../}:/home/ranger/src:delegated
-    depends_on:
-      - ranger-base
     environment:
       - BRANCH
       - BUILD_HOST_SRC
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml 
b/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
index 86e6c3ecb..dacbbf0cc 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-hadoop
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - HADOOP_VERSION=${HADOOP_VERSION}
         - HDFS_PLUGIN_VERSION=${HDFS_PLUGIN_VERSION}
         - YARN_PLUGIN_VERSION=${YARN_PLUGIN_VERSION}
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hbase.yml 
b/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
index 75b03ba5d..e39bc7461 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-hbase
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - HBASE_VERSION=${HBASE_VERSION}
         - HBASE_PLUGIN_VERSION=${HBASE_PLUGIN_VERSION}
     image: ranger-hbase
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hive.yml 
b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
index 64fc33110..5815a472d 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hive.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-hive
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - HIVE_HADOOP_VERSION=${HIVE_HADOOP_VERSION}
         - HIVE_VERSION=${HIVE_VERSION}
         - HIVE_PLUGIN_VERSION=${HIVE_PLUGIN_VERSION}
diff --git a/dev-support/ranger-docker/docker-compose.ranger-kafka.yml 
b/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
index f0bf31667..72fe904b1 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-kafka
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - KAFKA_VERSION=${KAFKA_VERSION}
         - KAFKA_PLUGIN_VERSION=${KAFKA_PLUGIN_VERSION}
     image: ranger-kafka
diff --git a/dev-support/ranger-docker/docker-compose.ranger-kms.yml 
b/dev-support/ranger-docker/docker-compose.ranger-kms.yml
index fed0f384d..82cd619f0 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-kms.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-kms.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-kms
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - KMS_VERSION=${KMS_VERSION}
         - RANGER_DB_TYPE=${RANGER_DB_TYPE}
     image: ranger-kms:latest
diff --git a/dev-support/ranger-docker/docker-compose.ranger-knox.yml 
b/dev-support/ranger-docker/docker-compose.ranger-knox.yml
index 59ae72481..6cb16d288 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-knox.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-knox.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-knox
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - KNOX_VERSION=${KNOX_VERSION}
         - KNOX_PLUGIN_VERSION=${KNOX_PLUGIN_VERSION}
     image: ranger-knox
diff --git a/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml 
b/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
index cfefb0c38..3bf4ba9e8 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-tagsync
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - TAGSYNC_VERSION=${TAGSYNC_VERSION}
     image: ranger-tagsync
     container_name: ranger-tagsync
diff --git a/dev-support/ranger-docker/docker-compose.ranger-usersync.yml 
b/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
index 2486da046..49238f674 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
@@ -4,6 +4,8 @@ services:
       context: .
       dockerfile: Dockerfile.ranger-usersync
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - USERSYNC_VERSION=${USERSYNC_VERSION}
     image: ranger-usersync
     container_name: ranger-usersync
diff --git a/dev-support/ranger-docker/docker-compose.ranger.yml 
b/dev-support/ranger-docker/docker-compose.ranger.yml
index a7ac101ed..a81299682 100644
--- a/dev-support/ranger-docker/docker-compose.ranger.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger.yml
@@ -4,9 +4,10 @@ services:
       context: .
       dockerfile: Dockerfile.ranger
       args:
+        - RANGER_BASE_IMAGE=${RANGER_BASE_IMAGE}
+        - RANGER_BASE_VERSION=${RANGER_BASE_VERSION}
         - RANGER_VERSION=${RANGER_VERSION}
         - RANGER_DB_TYPE=${RANGER_DB_TYPE}
-        - RANGER_ADMIN_JAVA_VERSION=${RANGER_ADMIN_JAVA_VERSION}
     image: ranger:latest
     container_name: ranger
     hostname: ranger.example.com
diff --git a/dev-support/ranger-docker/scripts/ranger-hadoop.sh 
b/dev-support/ranger-docker/scripts/ranger-hadoop.sh
index 1ca5af31d..164c25add 100755
--- a/dev-support/ranger-docker/scripts/ranger-hadoop.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hadoop.sh
@@ -15,9 +15,6 @@
 # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 # See the License for the specific language governing permissions and
 # limitations under the License.
-if [ "${OS_NAME}" = "UBUNTU" ]; then
-  service ssh start
-fi
 
 CREATE_HDFS_DIR=false
 
@@ -27,15 +24,13 @@ then
   su -c "cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys" hdfs
   su -c "chmod 0600 ~/.ssh/authorized_keys" hdfs
 
-  if [ "${OS_NAME}" = "RHEL" ]; then
-    ssh-keygen -A
-    /usr/sbin/sshd
-  fi
-
   su -c "ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa" yarn
   su -c "cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys" yarn
   su -c "chmod 0600 ~/.ssh/authorized_keys" yarn
 
+  ssh-keygen -A
+  /usr/sbin/sshd -D &
+
   # pdsh is unavailable with microdnf in rhel based image.
   echo "ssh" > /etc/pdsh/rcmd_default
 
diff --git a/dev-support/ranger-docker/scripts/ranger-hbase.sh 
b/dev-support/ranger-docker/scripts/ranger-hbase.sh
index 16ca5efce..77b3dc0a6 100755
--- a/dev-support/ranger-docker/scripts/ranger-hbase.sh
+++ b/dev-support/ranger-docker/scripts/ranger-hbase.sh
@@ -16,21 +16,15 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-if [ "${OS_NAME}" = "UBUNTU" ]; then
-  service ssh start
-fi
-
 if [ ! -e ${HBASE_HOME}/.setupDone ]
 then
-  if [ "${OS_NAME}" = "RHEL" ]; then
-      ssh-keygen -A
-      /usr/sbin/sshd
-  fi
-
   su -c "ssh-keygen -t rsa -P '' -f ~/.ssh/id_rsa" hbase
   su -c "cat ~/.ssh/id_rsa.pub >> ~/.ssh/authorized_keys" hbase
   su -c "chmod 0600 ~/.ssh/authorized_keys" hbase
 
+  ssh-keygen -A
+  /usr/sbin/sshd -D &
+
   # pdsh is unavailable with microdnf in rhel based image.
   echo "ssh" > /etc/pdsh/rcmd_default
 
diff --git a/ranger_in_docker b/ranger_in_docker
index f1499b184..33f4eb6ce 100755
--- a/ranger_in_docker
+++ b/ranger_in_docker
@@ -21,7 +21,7 @@
 # ./dev-support/ranger-docker/README.md
 #
 # Using this command, you should be able to build and run Apache Ranger
-# within few minites (in a docker container)
+# within few minutes (in a docker container)
 #
 # Pre Request:
 #
@@ -61,10 +61,10 @@ ENABLED_RANGER_SERVICE_FILE=${HOME}/.ranger_docker_services
 
    export ENABLE_DB_MOUNT
 
-CORE_SERVICES="ranger-base,ranger,ranger-usersync"
+CORE_SERVICES="ranger,ranger-usersync"
 if [ "${ENABLE_DB_MOUNT}" = "true" ];
 then
-    CORE_SERVICES="ranger-base,ranger,ranger-db-mounted,ranger-usersync"
+    CORE_SERVICES="ranger,ranger-db-mounted,ranger-usersync"
 fi
 
 if [ -z "${ENABLED_RANGER_SERVICES}" ]
@@ -102,12 +102,6 @@ do
     [ -f ${serviceFile} ] && OPT="${OPT} -f ${serviceFile}"
 done
 
-#
-# This is needed to build ranger-base build based on architecture
-#
-DOCKER_BUILDKIT=1
-export DOCKER_BUILDKIT
-
 if [ $# -eq 1 ]
 then
     DOCKER_ACTION="$1"
@@ -154,7 +148,6 @@ then
 fi
 
 build_ranger=0
-build_base_image=0
 
 cd ${RD_HOME}
 
@@ -172,45 +165,28 @@ then
         then
             #echo "Found only [${noOfFiles}] RANGER tar files. Enabling RANGER 
BUILD."
             build_ranger=1
-            build_base_image=1
         #else
             #echo "Found [${noOfFiles}] RANGER tar files. Skipping RANGER 
BUILD. To Force RANGER BUILD, please set RANGER_REBUILD=1 before running this 
script."
         fi
     else
         #echo "Found [RANGER_REBUILD as ${RANGER_REBUILD}]. Enabling RANGER 
BUILD."
-        build_base_image=1
         build_ranger=1
     fi
 
 
     cd ${RD_HOME}
 
-    if [ ${build_base_image} -eq 0 ]
-    then
-        docker images ranger-base:latest 2> /dev/null  | grep ranger-base  > 
/dev/null 2>&1
-        if [ $? -ne 0 ]
-        then
-            build_base_image=1
-        fi
-    fi
-
-    if [ ${build_base_image} -eq 1 ]
-    then
-        echo "+ docker-compose -f docker-compose.ranger-base.yml build 
--no-cache"
-        docker-compose -f docker-compose.ranger-base.yml build --no-cache
-    fi
-
     if [ ${build_ranger} -eq 1 ]
     then
         if [ ${DOCKER_MAVEN_BUILD} -eq 0 ]
         then
             cd ${RD_HOME}
 
-            echo "+ docker-compose -f docker-compose.ranger-base.yml -f 
docker-compose.ranger-build.yml down --remove-orphans"
-            docker-compose -f docker-compose.ranger-base.yml -f 
docker-compose.ranger-build.yml down --remove-orphans
+            echo "+ docker-compose -f docker-compose.ranger-build.yml down 
--remove-orphans"
+            docker-compose -f docker-compose.ranger-build.yml down 
--remove-orphans
 
-            echo "+ docker-compose -f docker-compose.ranger-base.yml -f 
docker-compose.ranger-build.yml up"
-            docker-compose -f docker-compose.ranger-base.yml -f 
docker-compose.ranger-build.yml up
+            echo "+ docker-compose -f docker-compose.ranger-build.yml up"
+            docker-compose -f docker-compose.ranger-build.yml up
             if [ $? -ne 0 ]
             then
                 echo "ERROR: Unable to complete RANGER build using DOCKER. 
Exiting ...."


Reply via email to