[airflow] 40/44: Python base image is shared between CI and PROD image (#12280)

[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 76f51e15fd4afbaad77b22f01768cc1a795e988b
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Thu Nov 12 12:31:14 2020 +0100

    Python base image is shared between CI and PROD image (#12280)
    
    When you are building CI images locally you use the CI
    base images from apache:airflow/python* now to maintain
    consistency and avoid often rebuilds. But when you build
    prod images, you would accidentaly override it with the
    python base image available in python repo which might be
    different (newer and not yet tested in CI). This PR
    changes it to use the same base image which is now
    tagged in Apache Airflow's dockerhub repository.
    
    (cherry picked from commit 3c2c29187afffb1a1dd1327803097651cdc079ee)
---
 scripts/ci/libraries/_push_pull_remove_images.sh | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/scripts/ci/libraries/_push_pull_remove_images.sh b/scripts/ci/libraries/_push_pull_remove_images.sh
index 4c51f0a..7c65db1 100644
--- a/scripts/ci/libraries/_push_pull_remove_images.sh
+++ b/scripts/ci/libraries/_push_pull_remove_images.sh
@@ -154,7 +154,8 @@ function push_pull_remove_images::pull_prod_images_if_needed() {
                 fi
                 push_pull_remove_images::pull_image_github_dockerhub "${PYTHON_BASE_IMAGE}" "${GITHUB_REGISTRY_PYTHON_BASE_IMAGE}${PYTHON_TAG_SUFFIX}"
             else
-                docker pull "${PYTHON_BASE_IMAGE}"
+                docker pull "${AIRFLOW_CI_PYTHON_IMAGE}"
+                docker tag "${AIRFLOW_CI_PYTHON_IMAGE}" "${PYTHON_BASE_IMAGE}"
             fi
             echo
         fi