Skip to content

Commit 13fea84

Browse files
kumaabmneethiraj
kumaab
authored and
mneethiraj
committed
RANGER-4942: Fix docker build with Dockerfile.ranger-build and update env variables with ENV key=value format
Signed-off-by: Madhan Neethiraj <madhan@apache.org> (cherry picked from commit 21b8ca9)
1 parent 720a6aa commit 13fea84

11 files changed

+42
-39
lines changed

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

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,10 @@ ARG RANGER_DB_TYPE
2222
ARG TARGETARCH
2323
ARG RANGER_ADMIN_JAVA_VERSION
2424

25-
RUN if [ "${OS_NAME}" == "UBUNTU" ]; then\
26-
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_ADMIN_JAVA_VERSION}-openjdk-${TARGETARCH}\
27-
update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_ADMIN_JAVA_VERSION}.0-openjdk-${TARGETARCH};\
25+
ENV JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_ADMIN_JAVA_VERSION}.0-openjdk-${TARGETARCH}
26+
27+
RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
28+
update-java-alternatives --set "$JAVA_HOME";\
2829
fi
2930

3031
COPY ./dist/version /home/ranger/dist/

‎dev-support/ranger-docker/Dockerfile.ranger-base

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM ubuntu:${UBUNTU_VERSION}
1919

2020
ARG TARGETARCH
2121
ARG RANGER_BASE_JAVA_VERSION
22-
ENV OS_NAME UBUNTU
22+
ENV OS_NAME=UBUNTU
2323

2424
# Install tzdata, Python, Java, python-requests
2525
RUN apt-get update && \
@@ -29,11 +29,11 @@ RUN apt-get update && \
2929
pip3 install requests
3030

3131
# Set environment variables
32-
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
33-
ENV RANGER_DIST /home/ranger/dist
34-
ENV RANGER_SCRIPTS /home/ranger/scripts
35-
ENV RANGER_HOME /opt/ranger
36-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
32+
ENV JAVA_HOME=/usr/lib/jvm/java-${RANGER_BASE_JAVA_VERSION}-openjdk-${TARGETARCH}
33+
ENV RANGER_DIST=/home/ranger/dist
34+
ENV RANGER_SCRIPTS=/home/ranger/scripts
35+
ENV RANGER_HOME=/opt/ranger
36+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
3737

3838
RUN update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_BASE_JAVA_VERSION}.0-openjdk-${TARGETARCH}
3939

‎dev-support/ranger-docker/Dockerfile.ranger-base-ubi

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ FROM registry.access.redhat.com/ubi9/ubi-minimal:${UBI_VERSION}
1919

2020
USER root
2121
ARG RANGER_BASE_UBI_JAVA_VERSION
22-
ENV OS_NAME RHEL
22+
ENV OS_NAME=RHEL
2323

2424
RUN microdnf --setopt=install_weak_deps=0 --setopt=tsflags=nodocs \
2525
install -y java-${RANGER_BASE_UBI_JAVA_VERSION}-openjdk-devel \
@@ -49,13 +49,14 @@ RUN microdnf install -y sudo
4949
RUN microdnf install -y initscripts
5050
RUN microdnf install -y openssh-clients
5151
RUN microdnf install -y openssh-server
52+
RUN microdnf install -y wget
5253
RUN pip3 install apache-ranger
5354

5455
# Set environment variables
55-
ENV RANGER_HOME /opt/ranger
56-
ENV RANGER_DIST /home/ranger/dist
57-
ENV RANGER_SCRIPTS /home/ranger/scripts
58-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
56+
ENV RANGER_HOME=/opt/ranger
57+
ENV RANGER_DIST=/home/ranger/dist
58+
ENV RANGER_SCRIPTS=/home/ranger/scripts
59+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin
5960

6061
RUN sudo sed -i 's/^HOME_MODE.*/HOME_MODE 0755/' /etc/login.defs
6162

‎dev-support/ranger-docker/Dockerfile.ranger-build

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -19,20 +19,21 @@ FROM ranger-base:latest
1919
ARG RANGER_BUILD_JAVA_VERSION
2020
ARG TARGETARCH
2121

22+
ENV JAVA_HOME=/usr/lib/jvm/java-1.${RANGER_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}
23+
2224
# Install necessary packages to build Ranger
23-
RUN if [ "${OS_NAME}" == "UBUNTU" ]; then\
24-
apt-get update && apt-get -y install git maven build-essential\
25-
update-java-alternatives --set /usr/lib/jvm/java-1.${RANGER_BUILD_JAVA_VERSION}.0-openjdk-${TARGETARCH}\
26-
ENV JAVA_HOME /usr/lib/jvm/java-${RANGER_BUILD_JAVA_VERSION}-openjdk-${TARGETARCH};\
25+
RUN if [ "${OS_NAME}" = "UBUNTU" ]; then\
26+
apt-get update && apt-get -y install git maven build-essential;\
27+
update-java-alternatives --set "$JAVA_HOME";\
2728
fi
2829

29-
RUN if [ "${OS_NAME}" == "RHEL" ]; then\
30+
RUN if [ "${OS_NAME}" = "RHEL" ]; then\
3031
microdnf install -y git maven gcc;\
3132
fi
3233

3334
# Set environment variables
34-
ENV MAVEN_HOME /usr/share/maven
35-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
35+
ENV MAVEN_HOME=/usr/share/maven
36+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/local/apache-maven/bin
3637

3738
# setup ranger group, and users
3839
RUN mkdir -p /home/ranger/git && \

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

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -46,12 +46,12 @@ RUN tar xvfz /home/ranger/dist/hadoop-${HADOOP_VERSION}.tar.gz --directory=/opt/
4646
chmod 744 ${RANGER_SCRIPTS}/ranger-hadoop-setup.sh ${RANGER_SCRIPTS}/ranger-hadoop.sh ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh && \
4747
chown hdfs:hadoop ${RANGER_SCRIPTS}/ranger-hadoop-mkdir.sh
4848

49-
ENV HADOOP_HOME /opt/hadoop
50-
ENV HADOOP_CONF_DIR /opt/hadoop/etc/hadoop
51-
ENV HADOOP_HDFS_HOME /opt/hadoop
52-
ENV HADOOP_MAPRED_HOME /opt/hadoop
53-
ENV HADOOP_COMMON_HOME /opt/hadoop
54-
ENV YARN_HOME /opt/hadoop
55-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hadoop/bin
49+
ENV HADOOP_HOME=/opt/hadoop
50+
ENV HADOOP_CONF_DIR=/opt/hadoop/etc/hadoop
51+
ENV HADOOP_HDFS_HOME=/opt/hadoop
52+
ENV HADOOP_MAPRED_HOME=/opt/hadoop
53+
ENV HADOOP_COMMON_HOME=/opt/hadoop
54+
ENV YARN_HOME=/opt/hadoop
55+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hadoop/bin
5656

5757
ENTRYPOINT [ "/home/ranger/scripts/ranger-hadoop.sh" ]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN tar xvfz /home/ranger/dist/hbase-${HBASE_VERSION}-bin.tar.gz --directory=/op
3838
cp -f /home/ranger/scripts/ranger-hbase-plugin-install.properties /opt/ranger/ranger-hbase-plugin/install.properties && \
3939
chmod 744 ${RANGER_SCRIPTS}/ranger-hbase-setup.sh ${RANGER_SCRIPTS}/ranger-hbase.sh
4040

41-
ENV HBASE_HOME /opt/hbase
42-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hbase/bin
41+
ENV HBASE_HOME=/opt/hbase
42+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hbase/bin
4343

4444
ENTRYPOINT [ "/home/ranger/scripts/ranger-hbase.sh" ]

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,9 @@ RUN tar xvfz /home/ranger/dist/apache-hive-${HIVE_VERSION}-bin.tar.gz --director
4646
cp -f /home/ranger/scripts/ranger-hive-plugin-install.properties /opt/ranger/ranger-hive-plugin/install.properties && \
4747
chmod 744 ${RANGER_SCRIPTS}/ranger-hive-setup.sh ${RANGER_SCRIPTS}/ranger-hive.sh
4848

49-
ENV HIVE_HOME /opt/hive
50-
ENV HADOOP_HOME /opt/hadoop
51-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/hadoop/bin
49+
ENV HIVE_HOME=/opt/hive
50+
ENV HADOOP_HOME=/opt/hadoop
51+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/hive/bin:/opt/hadoop/bin
5252

5353

5454
ENTRYPOINT [ "/home/ranger/scripts/ranger-hive.sh" ]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ RUN tar xvfz /home/ranger/dist/kafka_2.12-${KAFKA_VERSION}.tgz --directory=/opt/
3737
cp -f /home/ranger/scripts/ranger-kafka-plugin-install.properties /opt/ranger/ranger-kafka-plugin/install.properties && \
3838
chmod 744 ${RANGER_SCRIPTS}/ranger-kafka-setup.sh ${RANGER_SCRIPTS}/ranger-kafka.sh
3939

40-
ENV KAFKA_HOME /opt/kafka
41-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
40+
ENV KAFKA_HOME=/opt/kafka
41+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/kafka/bin
4242

4343
ENTRYPOINT [ "/home/ranger/scripts/ranger-kafka.sh" ]

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,8 +40,8 @@ RUN tar xvfz /home/ranger/dist/knox-${KNOX_VERSION}.tar.gz --directory=/opt/ &&
4040
cp -f /home/ranger/scripts/ranger-knox-sandbox.xml /opt/knox/conf/topologies/sandbox.xml && \
4141
chmod 744 ${RANGER_SCRIPTS}/ranger-knox-setup.sh ${RANGER_SCRIPTS}/ranger-knox.sh ${RANGER_SCRIPTS}/ranger-knox-expect.py
4242

43-
ENV KNOX_HOME /opt/knox
44-
ENV PATH /usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/knox/bin
43+
ENV KNOX_HOME=/opt/knox
44+
ENV PATH=/usr/java/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/opt/knox/bin
4545

4646
RUN chmod a+rwx /home/ranger/scripts/ranger-knox-expect.py
4747

‎dev-support/ranger-docker/Dockerfile.ranger-mysql

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,4 @@ COPY config/my.cnf /home/mysql/.my.cnf
2626
RUN sed -i "s/skip-name-resolve/# skip-name-resolve/" /etc/mysql/mariadb.cnf
2727
RUN chown -R mysql:mysql /docker-entrypoint-initdb.d/ /home/mysql
2828

29-
ENV MYSQL_ROOT_PASSWORD rangerR0cks!
29+
ENV MYSQL_ROOT_PASSWORD=rangerR0cks!

0 commit comments

Comments
 (0)