[airflow] 38/44: Docker context files should be available earlier (#12219)

[po...@apache.org]

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 10b6c48b67ec2c23b256897a6e5b562178a1eb9b
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Wed Nov 11 11:00:16 2020 +0100

    Docker context files should be available earlier (#12219)
    
    If you want to override constraints with local version,
    the docker-context-files should be earlier in the Dockerfile
    
    (cherry picked from commit 9b7e7603c4a01c6c943fa68df3b20a8859cdde1e)
---
 .gitignore    | 2 ++
 Dockerfile.ci | 8 ++++----
 2 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/.gitignore b/.gitignore
index 27b6f0c..6b2650c 100644
--- a/.gitignore
+++ b/.gitignore
@@ -188,6 +188,8 @@ dmypy.json
 log.txt*
 /backport_packages/CHANGELOG.txt
 
+# Docker context files
+/docker-context-files
 # Local .terraform directories
 **/.terraform/*
 
diff --git a/Dockerfile.ci b/Dockerfile.ci
index fae86b2..7699706 100644
--- a/Dockerfile.ci
+++ b/Dockerfile.ci
@@ -260,6 +260,10 @@ ENV AIRFLOW_LOCAL_PIP_WHEELS=${AIRFLOW_LOCAL_PIP_WHEELS}
 ARG INSTALL_AIRFLOW_VIA_PIP="true"
 ENV INSTALL_AIRFLOW_VIA_PIP=${INSTALL_AIRFLOW_VIA_PIP}
 
+# If wheel files are found in /docker-context-files during installation
+# they are also installed additionally to whatever is installed from Airflow.
+COPY docker-context-files /docker-context-files
+
 # In case of CI builds we want to pre-install master version of airflow dependencies so that
 # We do not have to always reinstall it from the scratch.
 # This can be reinstalled from latest master by increasing PIP_DEPENDENCIES_EPOCH_NUMBER.
@@ -311,10 +315,6 @@ RUN if [[ ${INSTALL_AIRFLOW_VIA_PIP} == "true" ]]; then \
         fi; \
     fi
 
-# If wheel files are found in /docker-context-files sduring installation
-# they are also installed additionally to whatever is installed from Airflow.
-COPY docker-context-files /docker-context-files
-
 RUN if [[ ${AIRFLOW_LOCAL_PIP_WHEELS} != "true" ]]; then \
         if ls /docker-context-files/*.whl 1> /dev/null 2>&1; then \
             pip install --no-deps /docker-context-files/*.whl; \