Skip to content

Commit

Permalink
fixup! [AIRFLOW-6462] Limit exported variables in Dockerfile/Breeze
Browse files Browse the repository at this point in the history
  • Loading branch information
Kamil Breguła committed Jan 5, 2020
1 parent 2136e98 commit 7d9b556
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 3 deletions.
5 changes: 3 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -146,10 +146,11 @@ RUN mkdir -pv /usr/share/man/man1 \
&& apt-get clean \
&& rm -rf /var/lib/apt/lists/*

ENV HADOOP_HOME="/opt/hadoop-cdh" HIVE_HOME="/opt/hive"

# Install Hadoop and Hive
# It is done in one step to share variables.
ENV HADOOP_HOME="/opt/hadoop-cdh" HIVE_HOME="/opt/hive"

RUN HADOOP_DISTRO="cdh" \
&& HADOOP_MAJOR="5" \
&& HADOOP_DISTRO_VERSION="5.11.0" \
Expand Down Expand Up @@ -214,9 +215,9 @@ RUN curl -Lo kind \

# Install Apache RAT
ARG RAT_VERSION="0.13"
ENV RAT_JAR="/opt/apache-rat-${RAT_VERSION}.jar"

RUN RAT_URL="https://repo1.maven.org/maven2/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar" \
&& RAT_JAR="/opt/apache-rat.jar" \
&& RAT_JAR_MD5="${RAT_JAR}.md5" \
&& RAT_URL_MD5="${RAT_URL}.md5" \
&& echo "Downloading RAT from ${RAT_URL} to ${RAT_JAR}" \
Expand Down
2 changes: 1 addition & 1 deletion scripts/ci/in_container/run_check_licence.sh
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ sudo mkdir -p docs/_build/html/

echo "Running license checks. This can take a while."

if ! java -jar "${RAT_JAR}" -E "${AIRFLOW_SOURCES}"/.rat-excludes \
if ! java -jar "/opt/apache-rat.jar" -E "${AIRFLOW_SOURCES}"/.rat-excludes \
-d "${AIRFLOW_SOURCES}" | tee "${AIRFLOW_SOURCES}/logs/rat-results.txt" ; then
echo >&2 "RAT exited abnormally"
exit 1
Expand Down

0 comments on commit 7d9b556

Please sign in to comment.