RANGER-5401: Use Volume Mounts for ranger-plugin configs

dev-support/ranger-docker/.env

@@ -8,9 +8,9 @@ BUILD_OPTS=
 # 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=20251023-1-8
+RANGER_BASE_VERSION=20260123-2-8
 # Java version used to build Apache Ranger is present as suffix: -8, valid values for suffix: -8, -11, -17
-RANGER_BASE_BUILD_VERSION=20251023-1-8
+RANGER_BASE_BUILD_VERSION=20260123-2-8
 RANGER_VERSION=3.0.0-SNAPSHOT
 
 # Hadoop Configuration

dev-support/ranger-docker/Dockerfile.ranger

@@ -26,17 +26,14 @@ ARG TARGETARCH
 COPY ./dist/ranger-${RANGER_VERSION}-admin.tar.gz     /home/ranger/dist/
 COPY ./scripts/admin/ranger.sh                        ${RANGER_SCRIPTS}/
 COPY ./scripts/admin/create-ranger-services.py        ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                     ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh           ${RANGER_SCRIPTS}/
 
 RUN    tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-admin.tar.gz --directory=${RANGER_HOME} \
     && ln -s ${RANGER_HOME}/ranger-${RANGER_VERSION}-admin ${RANGER_HOME}/admin \
     && rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-admin.tar.gz \
     && rm -f /opt/ranger/admin/install.properties \
     && mkdir -p /var/run/ranger /var/log/ranger /usr/share/java/ \
     && chown -R ranger:ranger ${RANGER_HOME}/admin/ ${RANGER_SCRIPTS}/ /var/run/ranger/ /var/log/ranger/ \
-    && chmod 755 ${RANGER_SCRIPTS}/ranger.sh ${RANGER_SCRIPTS}/wait_for_keytab.sh \
-    && chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh
+    && chmod 755 ${RANGER_SCRIPTS}/ranger.sh
 
 FROM ranger AS ranger_postgres
 COPY ./downloads/postgresql-42.2.16.jre7.jar         /home/ranger/dist/

dev-support/ranger-docker/Dockerfile.ranger-hadoop

@@ -23,26 +23,12 @@ ARG HDFS_PLUGIN_VERSION
 ARG YARN_PLUGIN_VERSION
 ARG TEZ_VERSION
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                          /home/ranger/dist/
 COPY ./dist/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin.tar.gz /home/ranger/dist/
 COPY ./dist/ranger-${YARN_PLUGIN_VERSION}-yarn-plugin.tar.gz /home/ranger/dist/
 COPY ./downloads/hadoop-${HADOOP_VERSION}.tar.gz             /home/ranger/dist/
 COPY ./downloads/apache-tez-${TEZ_VERSION}-bin.tar.gz        /home/ranger/dist/
 
-COPY ./scripts/hadoop/ranger-hadoop-setup.sh                ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/ranger-hadoop.sh                      ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/ranger-hadoop-mkdir.sh                ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/ranger-hadoop-healthcheck.sh          ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/ranger-hdfs-plugin-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/ranger-yarn-plugin-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/core-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/hdfs-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/yarn-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                           ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh                 ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                                /etc/krb5.conf
+COPY ./scripts/hadoop/*.sh                                   ${RANGER_SCRIPTS}/
 
 RUN tar xvfz /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/ && \
     ln -s /opt/hadoop-${HADOOP_VERSION} /opt/hadoop && \
@@ -53,16 +39,14 @@ RUN tar xvfz /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/
     tar xvfz /home/ranger/dist/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin /opt/ranger/ranger-hdfs-plugin && \
     rm -f /home/ranger/dist/ranger-${HDFS_PLUGIN_VERSION}-hdfs-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-hdfs-plugin-install.properties /opt/ranger/ranger-hdfs-plugin/install.properties && \
+    rm -f /opt/ranger/ranger-hdfs-plugin/install.properties && \
     tar xvfz /home/ranger/dist/ranger-${YARN_PLUGIN_VERSION}-yarn-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${YARN_PLUGIN_VERSION}-yarn-plugin /opt/ranger/ranger-yarn-plugin && \
     rm -f /home/ranger/dist/ranger-${YARN_PLUGIN_VERSION}-yarn-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-yarn-plugin-install.properties /opt/ranger/ranger-yarn-plugin/install.properties && \
+    rm -f /opt/ranger/ranger-yarn-plugin/install.properties && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-hadoop-setup.sh ${RANGER_SCRIPTS}/ranger-hadoop.sh ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh && \
     useradd -g hadoop -ms /bin/bash healthcheck && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-hadoop-healthcheck.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
     chown healthcheck:hadoop ${RANGER_SCRIPTS}/ranger-hadoop-healthcheck.sh && \
     chown hdfs:hadoop ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh
 

dev-support/ranger-docker/Dockerfile.ranger-hbase

@@ -21,30 +21,17 @@ FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 ARG HBASE_VERSION
 ARG HBASE_PLUGIN_VERSION
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                             /home/ranger/dist/
 COPY ./dist/ranger-${HBASE_PLUGIN_VERSION}-hbase-plugin.tar.gz  /home/ranger/dist/
 COPY ./downloads/hbase-${HBASE_VERSION}-bin.tar.gz              /home/ranger/dist/
-
-COPY ./scripts/hbase/ranger-hbase-setup.sh                  ${RANGER_SCRIPTS}/
-COPY ./scripts/hbase/ranger-hbase.sh                        ${RANGER_SCRIPTS}/
-COPY ./scripts/hbase/ranger-hbase-plugin-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/hbase/hbase-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/core-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                           ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh                 ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                                /etc/krb5.conf
+COPY ./scripts/hbase/*.sh                                       ${RANGER_SCRIPTS}/
 
 RUN tar xvfz /home/ranger/dist/hbase-${HBASE_VERSION}-bin.tar.gz --directory=/opt/ && \
     ln -s /opt/hbase-${HBASE_VERSION} /opt/hbase && \
     rm -f /home/ranger/dist/hbase-${HBASE_VERSION}-bin.tar.gz && \
     tar xvfz /home/ranger/dist/ranger-${HBASE_PLUGIN_VERSION}-hbase-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${HBASE_PLUGIN_VERSION}-hbase-plugin /opt/ranger/ranger-hbase-plugin && \
     rm -f /home/ranger/dist/ranger-${HBASE_PLUGIN_VERSION}-hbase-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-hbase-plugin-install.properties /opt/ranger/ranger-hbase-plugin/install.properties && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
+    rm -f /opt/ranger/ranger-hbase-plugin/install.properties && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-hbase-setup.sh ${RANGER_SCRIPTS}/ranger-hbase.sh
 
 RUN apt-get update && \

dev-support/ranger-docker/Dockerfile.ranger-hive

@@ -25,9 +25,6 @@ ARG HIVE_PLUGIN_VERSION
 ARG TEZ_VERSION
 ARG RANGER_DB_TYPE
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                          /home/ranger/dist/
 COPY ./dist/ranger-${HIVE_PLUGIN_VERSION}-hive-plugin.tar.gz /home/ranger/dist/
 COPY ./downloads/apache-hive-${HIVE_VERSION}-bin.tar.gz      /home/ranger/dist/
 COPY ./downloads/hadoop-${HIVE_HADOOP_VERSION}.tar.gz        /home/ranger/dist/
@@ -36,16 +33,7 @@ COPY ./downloads/postgresql-42.2.16.jre7.jar                 /home/ranger/dist/
 COPY ./downloads/mysql-connector-java-8.0.28.jar             /home/ranger/dist/
 COPY ./downloads/ojdbc8.jar                                  /home/ranger/dist/
 
-COPY ./scripts/hive/ranger-hive-setup.sh                  ${RANGER_SCRIPTS}/
-COPY ./scripts/hive/ranger-hive.sh                        ${RANGER_SCRIPTS}/
-COPY ./scripts/hive/ranger-hive-plugin-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/hive/hive-site-${RANGER_DB_TYPE}.xml       ${RANGER_SCRIPTS}/hive-site.xml
-COPY ./scripts/hive/hive-log4j2.properties                ${RANGER_SCRIPTS}/
-COPY ./scripts/hive/hive-metastore-log4j2.properties      ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/core-site.xml                       ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh               ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                              /etc/krb5.conf
+COPY ./scripts/hive/*.sh                                     ${RANGER_SCRIPTS}/
 
 RUN cd /opt && tar xzf /home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz && \
     ln -s /opt/apache-hive-${HIVE_VERSION}-bin /opt/hive && \
@@ -62,9 +50,7 @@ RUN cd /opt && tar xzf /home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz
     tar xvfz /home/ranger/dist/ranger-${HIVE_PLUGIN_VERSION}-hive-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${HIVE_PLUGIN_VERSION}-hive-plugin /opt/ranger/ranger-hive-plugin && \
     rm -f /home/ranger/dist/ranger-${HIVE_PLUGIN_VERSION}-hive-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-hive-plugin-install.properties /opt/ranger/ranger-hive-plugin/install.properties && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
+    rm -f /opt/ranger/ranger-hive-plugin/install.properties && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-hive-setup.sh ${RANGER_SCRIPTS}/ranger-hive.sh
 
 ENV HIVE_HOME=/opt/hive

dev-support/ranger-docker/Dockerfile.ranger-kafka

@@ -21,30 +21,17 @@ FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 ARG KAFKA_VERSION
 ARG KAFKA_PLUGIN_VERSION
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                            /home/ranger/dist/
 COPY ./dist/ranger-${KAFKA_PLUGIN_VERSION}-kafka-plugin.tar.gz /home/ranger/dist/
 COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz               /home/ranger/dist/
-
-COPY ./scripts/kafka/ranger-kafka-setup.sh                  ${RANGER_SCRIPTS}/
-COPY ./scripts/kafka/ranger-kafka.sh                        ${RANGER_SCRIPTS}/
-COPY ./scripts/kafka/ranger-kafka-plugin-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/kafka/kafka-server-jaas.conf                 ${RANGER_SCRIPTS}/
-COPY ./scripts/hadoop/core-site.xml                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                           ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh                 ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                                /etc/krb5.conf
+COPY ./scripts/kafka/*.sh                                   ${RANGER_SCRIPTS}/
 
 RUN tar xvfz /home/ranger/dist/kafka_2.12-${KAFKA_VERSION}.tgz --directory=/opt/ && \
     ln -s /opt/kafka_2.12-${KAFKA_VERSION} /opt/kafka && \
     rm -f /home/ranger/dist/kafka_2.12-${KAFKA_VERSION}.tgz && \
     tar xvfz /home/ranger/dist/ranger-${KAFKA_PLUGIN_VERSION}-kafka-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${KAFKA_PLUGIN_VERSION}-kafka-plugin /opt/ranger/ranger-kafka-plugin && \
     rm -f /home/ranger/dist/ranger-${KAFKA_PLUGIN_VERSION}-kafka-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-kafka-plugin-install.properties /opt/ranger/ranger-kafka-plugin/install.properties && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
+    rm -f /opt/ranger/ranger-kafka-plugin/install.properties && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-kafka-setup.sh ${RANGER_SCRIPTS}/ranger-kafka.sh
 
 ENV KAFKA_HOME=/opt/kafka

dev-support/ranger-docker/Dockerfile.ranger-kms

@@ -24,8 +24,6 @@ ARG RANGER_DB_TYPE
 
 COPY ./dist/ranger-${KMS_VERSION}-kms.tar.gz                       /home/ranger/dist/
 COPY ./scripts/kms/ranger-kms.sh                                   ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                                  ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh                        ${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 && \
@@ -39,8 +37,6 @@ RUN tar xvfz /home/ranger/dist/ranger-${KMS_VERSION}-kms.tar.gz --directory=${RA
     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/ /etc/ranger && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-kms.sh
 
 FROM ranger-kms AS ranger_postgres

dev-support/ranger-docker/Dockerfile.ranger-knox

@@ -21,31 +21,20 @@ FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 ARG KNOX_VERSION
 ARG KNOX_PLUGIN_VERSION
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                           /home/ranger/dist/
 COPY ./dist/ranger-${KNOX_PLUGIN_VERSION}-knox-plugin.tar.gz  /home/ranger/dist/
 COPY ./downloads/knox-${KNOX_VERSION}.tar.gz                  /home/ranger/dist/
 
-COPY ./scripts/knox/ranger-knox-setup.sh                  ${RANGER_SCRIPTS}/
-COPY ./scripts/knox/ranger-knox.sh                        ${RANGER_SCRIPTS}/
-COPY ./scripts/knox/ranger-knox-plugin-install.properties ${RANGER_SCRIPTS}/
+COPY ./scripts/knox/*.sh                                  ${RANGER_SCRIPTS}/
 COPY ./scripts/knox/ranger-knox-expect.py                 ${RANGER_SCRIPTS}/
-COPY ./scripts/knox/ranger-knox-sandbox.xml               ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh               ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                              /etc/krb5.conf
 
 RUN tar xvfz /home/ranger/dist/knox-${KNOX_VERSION}.tar.gz --directory=/opt/ && \
     ln -s /opt/knox-${KNOX_VERSION} /opt/knox && \
     rm -f /home/ranger/dist/knox-${KNOX_VERSION}.tar.gz && \
     tar xvfz /home/ranger/dist/ranger-${KNOX_PLUGIN_VERSION}-knox-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${KNOX_PLUGIN_VERSION}-knox-plugin /opt/ranger/ranger-knox-plugin && \
     rm -f /home/ranger/dist/ranger-${KNOX_PLUGIN_VERSION}-knox-plugin.tar.gz && \
-    cp -f ${RANGER_SCRIPTS}/ranger-knox-plugin-install.properties /opt/ranger/ranger-knox-plugin/install.properties && \
-    cp -f ${RANGER_SCRIPTS}/ranger-knox-sandbox.xml /opt/knox/conf/topologies/sandbox.xml && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
+    rm -f /opt/ranger/ranger-knox-plugin/install.properties && \
+    rm -f /opt/knox/conf/topologies/sandbox.xml && \
     chmod 744 ${RANGER_SCRIPTS}/ranger-knox-setup.sh ${RANGER_SCRIPTS}/ranger-knox.sh ${RANGER_SCRIPTS}/ranger-knox-expect.py
 
 ENV KNOX_HOME=/opt/knox

dev-support/ranger-docker/Dockerfile.ranger-opensearch

@@ -20,36 +20,16 @@ FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION}
 
 ARG OPENSEARCH_VERSION
 
-VOLUME /etc/keytabs
-
-COPY ./dist/version                                                   /home/ranger/dist/
 COPY ./downloads/opensearch-${OPENSEARCH_VERSION}-linux-x64.tar.gz   /home/ranger/dist/
 
-COPY ./scripts/opensearch/ranger-opensearch-setup.sh      ${RANGER_SCRIPTS}/
-COPY ./scripts/opensearch/ranger-opensearch.sh            ${RANGER_SCRIPTS}/
-COPY ./scripts/opensearch/opensearch.yml                  ${RANGER_SCRIPTS}/
-COPY ./scripts/opensearch/opensearch-jaas.conf            ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_keytab.sh                         ${RANGER_SCRIPTS}/
-COPY ./scripts/wait_for_testusers_keytab.sh               ${RANGER_SCRIPTS}/
-COPY ./scripts/kdc/krb5.conf                              /etc/krb5.conf
-
-# Create opensearch user and group
-RUN groupadd -g 3002 opensearch && \
-    useradd -u 3002 -g opensearch -G hadoop -s /bin/bash opensearch
-
 # Extract and setup OpenSearch
 RUN tar xvfz /home/ranger/dist/opensearch-${OPENSEARCH_VERSION}-linux-x64.tar.gz --directory=/opt/ && \
     ln -s /opt/opensearch-${OPENSEARCH_VERSION} /opt/opensearch && \
     rm -f /home/ranger/dist/opensearch-${OPENSEARCH_VERSION}-linux-x64.tar.gz && \
     mkdir -p /opt/opensearch/data /opt/opensearch/logs && \
-    chown -R opensearch:hadoop /opt/opensearch* && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/wait_for_testusers_keytab.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/ranger-opensearch-setup.sh && \
-    chmod 755 ${RANGER_SCRIPTS}/ranger-opensearch.sh
+    chown -R opensearch:hadoop /opt/opensearch*
 
 ENV OPENSEARCH_HOME=/opt/opensearch
 ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/opensearch/bin
 
-ENTRYPOINT [ "/home/ranger/scripts/ranger-opensearch.sh" ]
-
+ENTRYPOINT [ "/opt/ranger/ranger-opensearch.sh" ]

dev-support/ranger-docker/Dockerfile.ranger-solr

@@ -14,43 +14,32 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+ARG RANGER_BASE_IMAGE
+ARG RANGER_BASE_VERSION
 ARG SOLR_VERSION
+FROM ${RANGER_BASE_IMAGE}:${RANGER_BASE_VERSION} AS ranger-base
 FROM solr:${SOLR_VERSION}
 
 ARG SOLR_PLUGIN_VERSION
 
-VOLUME /etc/keytabs
-
-USER 0
+USER root
 
 RUN apt update && DEBIAN_FRONTEND="noninteractive" apt-get install -y krb5-user
 
-# Copy audit config set
-RUN mkdir -p /opt/solr/server/solr/configsets/ranger_audits/conf /home/ranger/scripts
-
-COPY ./scripts/solr/solr-ranger_audits/* /opt/solr/server/solr/configsets/ranger_audits/conf/
-COPY ./scripts/solr/solr-jaas.conf       /opt/solr/server/etc/jaas.conf
-COPY ./scripts/solr/solr-security.json   /var/solr/data/security.json
-COPY ./scripts/solr/ranger-solr.sh       /home/ranger/scripts/
-COPY ./scripts/wait_for_keytab.sh        /home/ranger/scripts/
-COPY ./scripts/wait_for_testusers_keytab.sh   /home/ranger/scripts/
-COPY ./scripts/kdc/krb5.conf             /etc/krb5.conf
-
+RUN mkdir -p /opt/solr/server/solr/configsets/ranger_audits/conf /home/ranger/dist /opt/ranger /home/ranger/scripts
 RUN chown -R solr:solr /opt/solr/server/solr/configsets/ranger_audits/
-RUN chmod +x /home/ranger/scripts/ranger-solr.sh /home/ranger/scripts/wait_for_keytab.sh /home/ranger/scripts/wait_for_testusers_keytab.sh
 
-# Copy Ranger plugin
-RUN mkdir -p /opt/ranger /home/ranger/dist /home/ranger/scripts
+COPY --from=ranger-base /home/ranger/scripts/wait_for_keytab.sh             /home/ranger/scripts/wait_for_keytab.sh
+COPY --from=ranger-base /home/ranger/scripts/wait_for_testusers_keytab.sh   /home/ranger/scripts/wait_for_testusers_keytab.sh
 
+# Copy Ranger plugin
 COPY ./dist/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin.tar.gz /home/ranger/dist/
-COPY ./scripts/solr/core-site.xml                            /home/ranger/scripts/
-COPY ./scripts/solr/ranger-solr-plugin-install.properties    /home/ranger/scripts/
 
 RUN tar xvfz /home/ranger/dist/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin.tar.gz --directory=/opt/ranger && \
     ln -s /opt/ranger/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin /opt/ranger/ranger-solr-plugin && \
     rm -f /home/ranger/dist/ranger-${SOLR_PLUGIN_VERSION}-solr-plugin.tar.gz && \
-    cp -f /home/ranger/scripts/ranger-solr-plugin-install.properties /opt/ranger/ranger-solr-plugin/install.properties && \
+    rm -f /opt/ranger/ranger-solr-plugin/install.properties && \
     chown -R solr:solr /opt/ranger
 
-ENTRYPOINT [ "/home/ranger/scripts/ranger-solr.sh" ]
+ENTRYPOINT [ "/opt/ranger/ranger-solr.sh" ]
 CMD ["solr-foreground"]