Skip to content

Commit

Permalink
[AIRFLOW-5143] Fix for potentially corrupted .jar (#5759)
Browse files Browse the repository at this point in the history
  • Loading branch information
potiuk authored Aug 8, 2019
1 parent fc6967b commit 8288cf1
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 23 deletions.
8 changes: 0 additions & 8 deletions .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -51,31 +51,23 @@ jobs:
- name: Flake8
stage: pre-test
script: ./scripts/ci/ci_flake8.sh
install: skip
- name: mypy
stage: pre-test
script: ./scripts/ci/ci_mypy.sh
install: skip
- name: Check license header
stage: pre-test
script: ./scripts/ci/ci_check_license.sh
install: skip
- name: Lint Dockerfile
stage: pre-test
script: ./scripts/ci/ci_lint_dockerfile.sh
install: skip
- name: Check docs
stage: test
script: ./scripts/ci/ci_docs.sh
install: skip
- name: Pylint
stage: pre-test
script: ./scripts/ci/ci_pylint.sh
install: skip
services:
- docker
before_install:
- ./scripts/ci/ci_before_install.sh
install:
- ./hooks/build
script: "./scripts/ci/ci_run_airflow_testing.sh"
13 changes: 0 additions & 13 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -216,19 +216,6 @@ fi

ENV PATH "${PATH}:/tmp/hive/bin"

ARG RAT_VERSION="0.12"

ENV RAT_VERSION="${RAT_VERSION}" \
RAT_JAR="/tmp/apache-rat-${RAT_VERSION}.jar" \
RAT_URL="http://repo1.maven.org/maven2/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar"

RUN \
if [[ "${APT_DEPS_IMAGE}" == "airflow-apt-deps-ci" ]]; then \
echo "Downloading RAT from ${RAT_URL} to ${RAT_JAR}" \
&& curl -sL ${RAT_URL} > ${RAT_JAR} \
;\
fi

############################################################################################################
# This is the target image - it installs PIP and NPM dependencies including efficient caching
# mechanisms - it might be used to build the bare airflow build or CI build
Expand Down
9 changes: 7 additions & 2 deletions Dockerfile-checklicence
Original file line number Diff line number Diff line change
Expand Up @@ -43,10 +43,15 @@ ARG RAT_VERSION="0.12"

ENV RAT_VERSION="${RAT_VERSION}" \
RAT_JAR="/tmp/apache-rat-${RAT_VERSION}.jar" \
RAT_URL="http://repo1.maven.org/maven2/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar"
RAT_URL="https://repo1.maven.org/maven2/org/apache/rat/apache-rat/${RAT_VERSION}/apache-rat-${RAT_VERSION}.jar"
ENV RAT_JAR_MD5="${RAT_JAR}.md5" \
RAT_URL_MD5="${RAT_URL}.md5"

RUN echo "Downloading RAT from ${RAT_URL} to ${RAT_JAR}" \
&& curl -sL ${RAT_URL} > ${RAT_JAR}
&& curl -sL "${RAT_URL}" > "${RAT_JAR}" \
&& curl -sL "${RAT_URL_MD5}" > "${RAT_JAR_MD5}" \
&& jar -tf "${RAT_JAR}" \
&& md5sum -c <<<"$(cat "${RAT_JAR_MD5}") ${RAT_JAR}"

ARG AIRFLOW_USER=airflow
ENV AIRFLOW_USER=${AIRFLOW_USER}
Expand Down

0 comments on commit 8288cf1

Please sign in to comment.