This is an automated email from the ASF dual-hosted git repository.
madhan 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 de049b958 RANGER-3937: [Docker] Add capability to run ranger plugins
and services with their own versions (#215)
de049b958 is described below
commit de049b958ae6496c91bac5df2fd11d488801e70d
Author: Abhishek Kumar <[email protected]>
AuthorDate: Thu Oct 26 20:34:02 2023 -0700
RANGER-3937: [Docker] Add capability to run ranger plugins and services
with their own versions (#215)
RANGER-3937: [Docker] Add capability to run ranger plugins and services
with their own versions
---------
Co-authored-by: abhishek-kumar <[email protected]>
---
dev-support/ranger-docker/.env | 17 +++++++++++++++-
dev-support/ranger-docker/Dockerfile.ranger-hadoop | 23 +++++++++++-----------
dev-support/ranger-docker/Dockerfile.ranger-hbase | 14 ++++++-------
dev-support/ranger-docker/Dockerfile.ranger-hive | 18 ++++++++---------
dev-support/ranger-docker/Dockerfile.ranger-kafka | 14 ++++++-------
dev-support/ranger-docker/Dockerfile.ranger-kms | 10 +++++-----
dev-support/ranger-docker/Dockerfile.ranger-knox | 14 ++++++-------
.../ranger-docker/Dockerfile.ranger-tagsync | 16 +++++++--------
.../ranger-docker/Dockerfile.ranger-usersync | 12 +++++------
.../ranger-docker/docker-compose.ranger-hadoop.yml | 6 ++++--
.../ranger-docker/docker-compose.ranger-hbase.yml | 4 ++--
.../ranger-docker/docker-compose.ranger-hive.yml | 4 ++--
.../ranger-docker/docker-compose.ranger-kafka.yml | 4 ++--
.../ranger-docker/docker-compose.ranger-kms.yml | 4 ++--
.../ranger-docker/docker-compose.ranger-knox.yml | 4 ++--
.../docker-compose.ranger-tagsync.yml | 4 ++--
.../docker-compose.ranger-usersync.yml | 4 ++--
17 files changed, 95 insertions(+), 77 deletions(-)
diff --git a/dev-support/ranger-docker/.env b/dev-support/ranger-docker/.env
index 5de76425b..60bc4a9f2 100644
--- a/dev-support/ranger-docker/.env
+++ b/dev-support/ranger-docker/.env
@@ -24,7 +24,8 @@ POSTGRES_VERSION=12
ENABLE_DB_MOUNT=true
ZK_VERSION=3.5.9
SOLR_VERSION=8
-RANGER_VERSION=3.0.0-SNAPSHOT
+
+# service versions
HADOOP_VERSION=3.3.0
HBASE_VERSION=2.4.6
HIVE_VERSION=3.1.2
@@ -32,6 +33,20 @@ HIVE_HADOOP_VERSION=3.1.1
KAFKA_VERSION=2.8.1
KNOX_VERSION=1.4.0
+# versions of ranger services
+RANGER_VERSION=3.0.0-SNAPSHOT
+KMS_VERSION=3.0.0-SNAPSHOT
+USERSYNC_VERSION=3.0.0-SNAPSHOT
+TAGSYNC_VERSION=3.0.0-SNAPSHOT
+
+# plugin versions
+HDFS_PLUGIN_VERSION=3.0.0-SNAPSHOT
+YARN_PLUGIN_VERSION=3.0.0-SNAPSHOT
+HIVE_PLUGIN_VERSION=3.0.0-SNAPSHOT
+HBASE_PLUGIN_VERSION=3.0.0-SNAPSHOT
+KAFKA_PLUGIN_VERSION=3.0.0-SNAPSHOT
+KNOX_PLUGIN_VERSION=3.0.0-SNAPSHOT
+
# To enable debug logs
DEBUG_ADMIN=false
DEBUG_USERSYNC=false
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hadoop
b/dev-support/ranger-docker/Dockerfile.ranger-hadoop
index 9970c7cb3..e1fa764e3 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hadoop
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hadoop
@@ -17,13 +17,14 @@
FROM ranger-base:latest
ARG HADOOP_VERSION
-ARG RANGER_VERSION
+ARG HDFS_PLUGIN_VERSION
+ARG YARN_PLUGIN_VERSION
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-yarn-plugin.tar.gz /home/ranger/dist/
-COPY ./downloads/hadoop-${HADOOP_VERSION}.tar.gz /home/ranger/dist/
+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 ./scripts/ranger-hadoop-setup.sh /home/ranger/scripts/
COPY ./scripts/ranger-hadoop.sh /home/ranger/scripts/
@@ -34,13 +35,13 @@ COPY ./scripts/ranger-yarn-plugin-install.properties
/home/ranger/scripts/
RUN tar xvfz /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz
--directory=/opt/ && \
ln -s /opt/hadoop-${HADOOP_VERSION} /opt/hadoop && \
rm -f /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz && \
- tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-hdfs-plugin
/opt/ranger/ranger-hdfs-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-hdfs-plugin.tar.gz && \
+ 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 /home/ranger/scripts/ranger-hdfs-plugin-install.properties
/opt/ranger/ranger-hdfs-plugin/install.properties && \
- tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-yarn-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-yarn-plugin
/opt/ranger/ranger-yarn-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-yarn-plugin.tar.gz && \
+ 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 /home/ranger/scripts/ranger-yarn-plugin-install.properties
/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 && \
chown hdfs:hadoop ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hbase
b/dev-support/ranger-docker/Dockerfile.ranger-hbase
index 1a2eea461..15beee7c3 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hbase
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hbase
@@ -17,12 +17,12 @@
FROM ranger-base:latest
ARG HBASE_VERSION
-ARG RANGER_VERSION
+ARG HBASE_PLUGIN_VERSION
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-hbase-plugin.tar.gz /home/ranger/dist/
-COPY ./downloads/hbase-${HBASE_VERSION}-bin.tar.gz /home/ranger/dist/
+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/ranger-hbase-setup.sh /home/ranger/scripts/
COPY ./scripts/ranger-hbase.sh /home/ranger/scripts/
@@ -32,9 +32,9 @@ COPY ./scripts/hbase-site.xml
/home/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-${RANGER_VERSION}-hbase-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-hbase-plugin
/opt/ranger/ranger-hbase-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-hbase-plugin.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 /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
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-hive
b/dev-support/ranger-docker/Dockerfile.ranger-hive
index fc09fdc38..dd326f854 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-hive
+++ b/dev-support/ranger-docker/Dockerfile.ranger-hive
@@ -18,15 +18,15 @@ FROM ranger-base:latest
ARG HIVE_VERSION
ARG HIVE_HADOOP_VERSION
-ARG RANGER_VERSION
+ARG HIVE_PLUGIN_VERSION
ARG RANGER_DB_TYPE
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_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/
-COPY ./downloads/mysql-connector-java-8.0.28.jar /home/ranger/dist
+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/
+COPY ./downloads/mysql-connector-java-8.0.28.jar /home/ranger/dist
COPY ./scripts/ranger-hive-setup.sh /home/ranger/scripts/
COPY ./scripts/ranger-hive.sh /home/ranger/scripts/
@@ -40,9 +40,9 @@ RUN tar xvfz
/home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz --director
tar xvfz /home/ranger/dist/hadoop-${HIVE_HADOOP_VERSION}.tar.gz
--directory=/opt/ && \
ln -s /opt/hadoop-${HIVE_HADOOP_VERSION} /opt/hadoop && \
rm -f /home/ranger/dist/hadoop-${HIVE_HADOOP_VERSION}.tar.gz && \
- tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-hive-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-hive-plugin
/opt/ranger/ranger-hive-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-hive-plugin.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 /home/ranger/scripts/ranger-hive-plugin-install.properties
/opt/ranger/ranger-hive-plugin/install.properties && \
chmod 744 ${RANGER_SCRIPTS}/ranger-hive-setup.sh
${RANGER_SCRIPTS}/ranger-hive.sh
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-kafka
b/dev-support/ranger-docker/Dockerfile.ranger-kafka
index 24269b6cd..c03452e38 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-kafka
+++ b/dev-support/ranger-docker/Dockerfile.ranger-kafka
@@ -17,12 +17,12 @@
FROM ranger-base:latest
ARG KAFKA_VERSION
-ARG RANGER_VERSION
+ARG KAFKA_PLUGIN_VERSION
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-kafka-plugin.tar.gz /home/ranger/dist/
-COPY ./downloads/kafka_2.12-${KAFKA_VERSION}.tgz /home/ranger/dist/
+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/ranger-kafka-setup.sh /home/ranger/scripts/
COPY ./scripts/ranger-kafka.sh /home/ranger/scripts/
@@ -31,9 +31,9 @@ COPY ./scripts/ranger-kafka-plugin-install.properties
/home/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-${RANGER_VERSION}-kafka-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-kafka-plugin
/opt/ranger/ranger-kafka-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-kafka-plugin.tar.gz && \
+ 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 /home/ranger/scripts/ranger-kafka-plugin-install.properties
/opt/ranger/ranger-kafka-plugin/install.properties && \
chmod 744 ${RANGER_SCRIPTS}/ranger-kafka-setup.sh
${RANGER_SCRIPTS}/ranger-kafka.sh
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-kms
b/dev-support/ranger-docker/Dockerfile.ranger-kms
index 96fcecff9..40454b079 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-kms
+++ b/dev-support/ranger-docker/Dockerfile.ranger-kms
@@ -17,18 +17,18 @@ ARG RANGER_DB_TYPE
FROM ranger-base:latest AS ranger-kms
-ARG RANGER_VERSION
+ARG KMS_VERSION
ARG RANGER_DB_TYPE
COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-kms.tar.gz /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
-RUN tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-kms.tar.gz
--directory=${RANGER_HOME} && \
- ln -s ${RANGER_HOME}/ranger-${RANGER_VERSION}-kms ${RANGER_HOME}/kms && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-kms.tar.gz && \
+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 && \
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 && \
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-knox
b/dev-support/ranger-docker/Dockerfile.ranger-knox
index df4671149..93ae15fb9 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-knox
+++ b/dev-support/ranger-docker/Dockerfile.ranger-knox
@@ -17,12 +17,12 @@
FROM ranger-base:latest
ARG KNOX_VERSION
-ARG RANGER_VERSION
+ARG KNOX_PLUGIN_VERSION
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-knox-plugin.tar.gz /home/ranger/dist/
-COPY ./downloads/knox-${KNOX_VERSION}.tar.gz /home/ranger/dist/
+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/ranger-knox-setup.sh /home/ranger/scripts/
COPY ./scripts/ranger-knox.sh /home/ranger/scripts/
@@ -34,9 +34,9 @@ RUN apt-get update && apt-get install -y expect && \
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-${RANGER_VERSION}-knox-plugin.tar.gz
--directory=/opt/ranger && \
- ln -s /opt/ranger/ranger-${RANGER_VERSION}-knox-plugin
/opt/ranger/ranger-knox-plugin && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-knox-plugin.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 /home/ranger/scripts/ranger-knox-plugin-install.properties
/opt/ranger/ranger-knox-plugin/install.properties && \
cp -f /home/ranger/scripts/ranger-knox-sandbox.xml
/opt/knox/conf/topologies/sandbox.xml && \
chmod 744 ${RANGER_SCRIPTS}/ranger-knox-setup.sh
${RANGER_SCRIPTS}/ranger-knox.sh ${RANGER_SCRIPTS}/ranger-knox-expect.sh
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-tagsync
b/dev-support/ranger-docker/Dockerfile.ranger-tagsync
index 1c9ad67da..75b2753cf 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-tagsync
+++ b/dev-support/ranger-docker/Dockerfile.ranger-tagsync
@@ -16,18 +16,18 @@
FROM ranger-base:latest
-ARG RANGER_VERSION
+ARG TAGSYNC_VERSION
COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-tagsync.tar.gz /home/ranger/dist/
+COPY ./dist/ranger-${TAGSYNC_VERSION}-tagsync.tar.gz /home/ranger/dist/
-COPY ./scripts/ranger-tagsync.sh ${RANGER_SCRIPTS}/
-COPY ./scripts/ranger-tagsync-install.properties ${RANGER_SCRIPTS}/
-COPY ./scripts/ranger-tagsync-tags.json ${RANGER_SCRIPTS}/
+COPY ./scripts/ranger-tagsync.sh ${RANGER_SCRIPTS}/
+COPY ./scripts/ranger-tagsync-install.properties ${RANGER_SCRIPTS}/
+COPY ./scripts/ranger-tagsync-tags.json ${RANGER_SCRIPTS}/
-RUN tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-tagsync.tar.gz
--directory=${RANGER_HOME} && \
- ln -s ${RANGER_HOME}/ranger-${RANGER_VERSION}-tagsync
${RANGER_HOME}/tagsync && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-tagsync.tar.gz && \
+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 && \
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 && \
diff --git a/dev-support/ranger-docker/Dockerfile.ranger-usersync
b/dev-support/ranger-docker/Dockerfile.ranger-usersync
index d2b991c33..f40332701 100644
--- a/dev-support/ranger-docker/Dockerfile.ranger-usersync
+++ b/dev-support/ranger-docker/Dockerfile.ranger-usersync
@@ -16,18 +16,18 @@
FROM ranger-base:latest
-ARG RANGER_VERSION
+ARG USERSYNC_VERSION
-COPY ./dist/version /home/ranger/dist/
-COPY ./dist/ranger-${RANGER_VERSION}-usersync.tar.gz /home/ranger/dist/
+COPY ./dist/version /home/ranger/dist/
+COPY ./dist/ranger-${USERSYNC_VERSION}-usersync.tar.gz /home/ranger/dist/
COPY ./scripts/ranger-usersync.sh ${RANGER_SCRIPTS}/
COPY ./scripts/ranger-usersync-install.properties ${RANGER_SCRIPTS}/
COPY ./scripts/ugsync-file-source.csv ${RANGER_SCRIPTS}/
-RUN tar xvfz /home/ranger/dist/ranger-${RANGER_VERSION}-usersync.tar.gz
--directory=${RANGER_HOME} && \
- ln -s ${RANGER_HOME}/ranger-${RANGER_VERSION}-usersync
${RANGER_HOME}/usersync && \
- rm -f /home/ranger/dist/ranger-${RANGER_VERSION}-usersync.tar.gz && \
+RUN tar xvfz /home/ranger/dist/ranger-${USERSYNC_VERSION}-usersync.tar.gz
--directory=${RANGER_HOME} && \
+ 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 && \
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
b/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
index ff39a7026..c6aade0e7 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hadoop.yml
@@ -6,7 +6,8 @@ services:
dockerfile: Dockerfile.ranger-hadoop
args:
- HADOOP_VERSION=${HADOOP_VERSION}
- - RANGER_VERSION=${RANGER_VERSION}
+ - HDFS_PLUGIN_VERSION=${HDFS_PLUGIN_VERSION}
+ - YARN_PLUGIN_VERSION=${YARN_PLUGIN_VERSION}
image: ranger-hadoop
container_name: ranger-hadoop
hostname: ranger-hadoop.example.com
@@ -28,7 +29,8 @@ services:
start_period: 40s
environment:
- HADOOP_VERSION
- - RANGER_VERSION
+ - HDFS_PLUGIN_VERSION
+ - YARN_PLUGIN_VERSION
networks:
ranger:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
b/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
index 101d0616a..5df951c7b 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hbase.yml
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile.ranger-hbase
args:
- HBASE_VERSION=${HBASE_VERSION}
- - RANGER_VERSION=${RANGER_VERSION}
+ - HBASE_PLUGIN_VERSION=${HBASE_PLUGIN_VERSION}
image: ranger-hbase
container_name: ranger-hbase
hostname: ranger-hbase.example.com
@@ -26,7 +26,7 @@ services:
condition: service_started
environment:
- HBASE_VERSION
- - RANGER_VERSION
+ - HBASE_PLUGIN_VERSION
networks:
ranger:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-hive.yml
b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
index f4b986a14..01cd4b8b7 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-hive.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-hive.yml
@@ -7,7 +7,7 @@ services:
args:
- HIVE_HADOOP_VERSION=${HIVE_HADOOP_VERSION}
- HIVE_VERSION=${HIVE_VERSION}
- - RANGER_VERSION=${RANGER_VERSION}
+ - HIVE_PLUGIN_VERSION=${HIVE_PLUGIN_VERSION}
- RANGER_DB_TYPE=${RANGER_DB_TYPE}
image: ranger-hive
container_name: ranger-hive
@@ -28,7 +28,7 @@ services:
environment:
- HIVE_HADOOP_VERSION
- HIVE_VERSION
- - RANGER_VERSION
+ - HIVE_PLUGIN_VERSION
- RANGER_DB_TYPE
networks:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
b/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
index 3bd201cc8..c59847173 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-kafka.yml
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile.ranger-kafka
args:
- KAFKA_VERSION=${KAFKA_VERSION}
- - RANGER_VERSION=${RANGER_VERSION}
+ - KAFKA_PLUGIN_VERSION=${KAFKA_PLUGIN_VERSION}
image: ranger-kafka
container_name: ranger-kafka
hostname: ranger-kafka.example.com
@@ -23,7 +23,7 @@ services:
condition: service_started
environment:
- KAFKA_VERSION
- - RANGER_VERSION
+ - KAFKA_PLUGIN_VERSION
networks:
ranger:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-kms.yml
b/dev-support/ranger-docker/docker-compose.ranger-kms.yml
index 148b10a6a..3808e424e 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-kms.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-kms.yml
@@ -5,7 +5,7 @@ services:
context: .
dockerfile: Dockerfile.ranger-kms
args:
- - RANGER_VERSION=${RANGER_VERSION}
+ - KMS_VERSION=${KMS_VERSION}
- RANGER_DB_TYPE=${RANGER_DB_TYPE}
image: ranger-kms:latest
container_name: ranger-kms
@@ -20,7 +20,7 @@ services:
ranger:
condition: service_started
environment:
- - RANGER_VERSION
+ - KMS_VERSION
- RANGER_DB_TYPE
command:
- /home/ranger/scripts/ranger-kms.sh
diff --git a/dev-support/ranger-docker/docker-compose.ranger-knox.yml
b/dev-support/ranger-docker/docker-compose.ranger-knox.yml
index 82d330736..265f6e4bf 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-knox.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-knox.yml
@@ -6,7 +6,7 @@ services:
dockerfile: Dockerfile.ranger-knox
args:
- KNOX_VERSION=${KNOX_VERSION}
- - RANGER_VERSION=${RANGER_VERSION}
+ - KNOX_PLUGIN_VERSION=${KNOX_PLUGIN_VERSION}
image: ranger-knox
container_name: ranger-knox
hostname: ranger-knox.example.com
@@ -23,7 +23,7 @@ services:
condition: service_started
environment:
- KNOX_VERSION
- - RANGER_VERSION
+ - KNOX_PLUGIN_VERSION
networks:
ranger:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
b/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
index 24c4e3e2e..b4f7f2cb3 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-tagsync.yml
@@ -5,7 +5,7 @@ services:
context: .
dockerfile: Dockerfile.ranger-tagsync
args:
- - RANGER_VERSION=${RANGER_VERSION}
+ - TAGSYNC_VERSION=${TAGSYNC_VERSION}
image: ranger-tagsync
container_name: ranger-tagsync
hostname: ranger-tagsync.example.com
@@ -17,7 +17,7 @@ services:
ranger:
condition: service_started
environment:
- - RANGER_VERSION
+ - TAGSYNC_VERSION
- DEBUG_TAGSYNC=${DEBUG_TAGSYNC:-false}
networks:
diff --git a/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
b/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
index 37aa708d3..4fdca510c 100644
--- a/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
+++ b/dev-support/ranger-docker/docker-compose.ranger-usersync.yml
@@ -5,7 +5,7 @@ services:
context: .
dockerfile: Dockerfile.ranger-usersync
args:
- - RANGER_VERSION=${RANGER_VERSION}
+ - USERSYNC_VERSION=${USERSYNC_VERSION}
image: ranger-usersync
container_name: ranger-usersync
hostname: ranger-usersync.example.com
@@ -17,7 +17,7 @@ services:
ranger:
condition: service_started
environment:
- - RANGER_VERSION
+ - USERSYNC_VERSION
- ENABLE_FILE_SYNC_SOURCE
- DEBUG_USERSYNC=${DEBUG_USERSYNC:-false}
