[airflow] branch v1-10-test updated: fixup! Use AIRFLOW_CONSTRAINTS_LOCATION when passed during docker build (#12604)

[potiuk]

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


The following commit(s) were added to refs/heads/v1-10-test by this push:
     new 55cef31  fixup! Use AIRFLOW_CONSTRAINTS_LOCATION when passed during 
docker build (#12604)
55cef31 is described below

commit 55cef3122ccc36135259e0a86f350e93f25f712a
Author: Jarek Potiuk <ja...@potiuk.com>
AuthorDate: Sun Nov 29 18:48:20 2020 +0100

    fixup! Use AIRFLOW_CONSTRAINTS_LOCATION when passed during docker build 
(#12604)
---
 Dockerfile.ci | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/Dockerfile.ci b/Dockerfile.ci
index f378347..cac73bb 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -245,8 +245,8 @@ ENV 
AIRFLOW_EXTRAS=${AIRFLOW_EXTRAS}${ADDITIONAL_AIRFLOW_EXTRAS:+,}${ADDITIONAL_
 RUN echo "Installing with extras: ${AIRFLOW_EXTRAS}."
 
 ARG AIRFLOW_CONSTRAINTS_REFERENCE="constraints-master"
-ARG 
AIRFLOW_CONSTRAINTS_URL="https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt";
-ENV AIRFLOW_CONSTRAINTS_URL=${AIRFLOW_CONSTRAINTS_URL}
+ARG 
AIRFLOW_CONSTRAINTS_LOCATION="https://raw.githubusercontent.com/apache/airflow/${AIRFLOW_CONSTRAINTS_REFERENCE}/constraints-${PYTHON_MAJOR_MINOR_VERSION}.txt";
+ENV AIRFLOW_CONSTRAINTS_LOCATION=${AIRFLOW_CONSTRAINTS_LOCATION}
 
 # By changing the CI build epoch we can force reinstalling Airflow from the 
current master
 # It can also be overwritten manually by setting the AIRFLOW_CI_BUILD_EPOCH 
environment variable.
@@ -273,7 +273,6 @@ RUN if [[ ${AIRFLOW_PRE_CACHED_PIP_PACKAGES} == "true" ]]; 
then \
                 && pip uninstall --yes apache-airflow; \
     fi
 
-
 # Generate random hex dump file so that we can determine whether it's faster 
to rebuild the image
 # using current cache (when our dump is the same as the remote onb) or better 
to pull
 # the new image (when it is different)
@@ -341,7 +340,7 @@ COPY scripts/in_container/entrypoint_ci.sh /entrypoint
 RUN chmod a+x /entrypoint
 
 # We can copy everything here. The Context is filtered by dockerignore. This 
makes sure we are not
-# copying over stuff that is accidentally generated or that we do not need 
(such as .egginfo)
+# copying over stuff that is accidentally generated or that we do not need 
(such as egg-info)
 # if you want to add something that is missing and you expect to see it in the 
image you can
 # add it with ! in .dockerignore next to the airflow, test etc. directories 
there
 COPY . ${AIRFLOW_SOURCES}/