Merge pull request apache#7 from chancez/update_hadoop_home

Dockerfile*: Remove hadoop home symlink, just put everything into /opt/hadoop

Author: openshift-merge-robot

Dockerfile

@@ -69,12 +69,13 @@ ENV JAVA_HOME=/etc/alternatives/jre
 
 ENV HADOOP_VERSION 3.1.1
 
-ENV HADOOP_CLASSPATH=/opt/hadoop-$HADOOP_VERSION/share/hadoop/tools/lib/*
+ENV HADOOP_HOME=/opt/hadoop
+ENV HADOOP_LOG_DIR=$HADOOP_HOME/logs
+ENV HADOOP_CLASSPATH=$HADOOP_HOME/share/hadoop/tools/lib/*
 ENV HADOOP_CONF_DIR=/etc/hadoop
-ENV HADOOP_HOME=/opt/hadoop-$HADOOP_VERSION
 ENV PATH=$HADOOP_HOME/bin:$PATH
 
-COPY --from=build /build/hadoop-dist/target/hadoop-$HADOOP_VERSION /opt/hadoop-$HADOOP_VERSION
+COPY --from=build /build/hadoop-dist/target/hadoop-$HADOOP_VERSION $HADOOP_HOME
 # remove unnecessary doc/src files
 RUN rm -rf ${HADOOP_HOME}/share/doc \
     && for dir in common hdfs mapreduce tools yarn; do \
@@ -85,9 +86,8 @@ RUN rm -rf ${HADOOP_HOME}/share/doc \
     && rm -rf ${HADOOP_HOME}/share/hadoop/yarn/test \
     && find ${HADOOP_HOME}/share/hadoop -name *test*.jar | xargs rm -rf
 
-RUN ln -s /opt/hadoop-$HADOOP_VERSION/etc/hadoop /etc/hadoop
-RUN ln -s /opt/hadoop-$HADOOP_VERSION /opt/hadoop
-RUN mkdir -p /opt/hadoop-$HADOOP_VERSION/logs
+RUN ln -s $HADOOP_HOME/etc/hadoop $HADOOP_CONF_DIR
+RUN mkdir -p $HADOOP_LOG_DIR
 
 # https://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html
 # Java caches dns results forever, don't cache dns results forever:
@@ -101,8 +101,8 @@ RUN useradd hadoop -m -u 1002 -d $HADOOP_HOME
 # imagebuilder expects the directory to be created before VOLUME
 RUN mkdir -p /hadoop/dfs/data /hadoop/dfs/name
 # to allow running as non-root
-RUN chown -R 1002:0 /opt /hadoop /hadoop /etc/hadoop && \
-    chmod -R 774 /opt /hadoop /etc/hadoop /etc/passwd
+RUN chown -R 1002:0 $HADOOP_HOME /hadoop $HADOOP_CONF_DIR && \
+    chmod -R 774 $HADOOP_HOME /hadoop $HADOOP_CONF_DIR /etc/passwd
 
 VOLUME /hadoop/dfs/data /hadoop/dfs/name
 

Dockerfile.rhel

@@ -45,12 +45,12 @@ ENV JAVA_HOME=/etc/alternatives/jre
 
 ENV HADOOP_VERSION 3.1.1
 
-ENV HADOOP_CLASSPATH=/opt/hadoop-$HADOOP_VERSION/share/hadoop/tools/lib/*
+ENV HADOOP_HOME=/opt/hadoop
+ENV HADOOP_CLASSPATH=$HADOOP_HOME/share/hadoop/tools/lib/*
 ENV HADOOP_CONF_DIR=/etc/hadoop
-ENV HADOOP_HOME=/opt/hadoop-$HADOOP_VERSION
 ENV PATH=$HADOOP_HOME/bin:$PATH
 
-COPY --from=build /build/hadoop-dist/target/hadoop-$HADOOP_VERSION /opt/hadoop-$HADOOP_VERSION
+COPY --from=build /build/hadoop-dist/target/hadoop-$HADOOP_VERSION $HADOOP_HOME
 # remove unnecessary doc/src files
 RUN rm -rf ${HADOOP_HOME}/share/doc \
     && for dir in common hdfs mapreduce tools yarn; do \
@@ -61,11 +61,8 @@ RUN rm -rf ${HADOOP_HOME}/share/doc \
     && rm -rf ${HADOOP_HOME}/share/hadoop/yarn/test \
     && find ${HADOOP_HOME}/share/hadoop -name *test*.jar | xargs rm -rf
 
-RUN ln -s /opt/hadoop-$HADOOP_VERSION/etc/hadoop /etc/hadoop
-RUN ln -s /opt/hadoop-$HADOOP_VERSION /opt/hadoop
-RUN mkdir -p /opt/hadoop-$HADOOP_VERSION/logs
-
-RUN useradd hadoop -m -u 1002 -d $HADOOP_HOME
+RUN ln -s $HADOOP_HOME/etc/hadoop $HADOOP_CONF_DIR
+RUN mkdir -p $HADOOP_LOG_DIR
 
 # https://docs.oracle.com/javase/7/docs/technotes/guides/net/properties.html
 # Java caches dns results forever, don't cache dns results forever:
@@ -74,11 +71,13 @@ RUN sed -i '/networkaddress.cache.negative.ttl/d' $JAVA_HOME/lib/security/java.s
 RUN echo 'networkaddress.cache.ttl=0' >> $JAVA_HOME/lib/security/java.security
 RUN echo 'networkaddress.cache.negative.ttl=0' >> $JAVA_HOME/lib/security/java.security
 
+RUN useradd hadoop -m -u 1002 -d $HADOOP_HOME
+
 # imagebuilder expects the directory to be created before VOLUME
 RUN mkdir -p /hadoop/dfs/data /hadoop/dfs/name
 # to allow running as non-root
-RUN chown -R 1002:0 /opt /hadoop /hadoop /etc/hadoop && \
-    chmod -R 774 /opt /hadoop /etc/hadoop /etc/passwd
+RUN chown -R 1002:0 $HADOOP_HOME /hadoop $HADOOP_CONF_DIR && \
+    chmod -R 774 $HADOOP_HOME /hadoop $HADOOP_CONF_DIR /etc/passwd
 
 VOLUME /hadoop/dfs/data /hadoop/dfs/name