This is an automated email from the ASF dual-hosted git repository. potiuk pushed a commit to branch v1-10-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit d0316210f1647b4e719df08b2ca3f7727225a4ed Author: Kaxil Naik <[email protected]> AuthorDate: Wed Nov 25 07:43:47 2020 +0000 Use AIRFLOW_CONSTRAINTS_LOCATION when passed during docker build (#12604) Previously, even though this was passed during docker build it was ignored. This commit fixes it (cherry picked from commit c457c975b885469f09ef2e4c8d1f5836798bc820) --- Dockerfile | 2 +- Dockerfile.ci | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 00442bc..9b96cfa 100644 --- a/Dockerfile +++ b/Dockerfile @@ -176,7 +176,7 @@ RUN if [[ ${AIRFLOW_PRE_CACHED_PIP_PACKAGES} == "true" ]]; then \ fi; \ pip install --user \ "https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz#egg=apache-airflow[${AIRFLOW_EXTRAS}]"; \ - --constraint "https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt"; \ + --constraint "${AIRFLOW_CONSTRAINTS_LOCATION}" \ && pip uninstall --yes apache-airflow; \ fi diff --git a/Dockerfile.ci b/Dockerfile.ci index ac51a56..f378347 100644 --- a/Dockerfile.ci +++ b/Dockerfile.ci @@ -269,7 +269,7 @@ ENV INSTALL_AIRFLOW_VIA_PIP=${INSTALL_AIRFLOW_VIA_PIP} RUN if [[ ${AIRFLOW_PRE_CACHED_PIP_PACKAGES} == "true" ]]; then \ pip install \ "https://github.com/${AIRFLOW_REPO}/archive/${AIRFLOW_BRANCH}.tar.gz#egg=apache-airflow[${AIRFLOW_EXTRAS}]"; \ - --constraint "https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt"; \ + --constraint "${AIRFLOW_CONSTRAINTS_LOCATION}" \ && pip uninstall --yes apache-airflow; \ fi
