[airflow] 37/44: Fixes continuous image rebuilding with Breeze (#12256)

[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 4ca85a6a315c5c46aad95a67482e09de707c0293
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Tue Nov 10 17:34:52 2020 +0100

    Fixes continuous image rebuilding with Breeze (#12256)
    
    There was a problem that even if we pulled the right image
    from the Airflow repository, we have not tagged it properly.
    
    Also added protection for people who have not yet at all pulled
    the Python image from airflow, to force pull for the first time.
    
    (cherry picked from commit 09febee4c1caf4e430fcbad2386f80aab52a0b15)
---
 scripts/ci/libraries/_push_pull_remove_images.sh | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/scripts/ci/libraries/_push_pull_remove_images.sh b/scripts/ci/libraries/_push_pull_remove_images.sh
index e853f42..4c51f0a 100644
--- a/scripts/ci/libraries/_push_pull_remove_images.sh
+++ b/scripts/ci/libraries/_push_pull_remove_images.sh
@@ -105,6 +105,11 @@ function push_pull_remove_images::pull_image_github_dockerhub() {
 # Pulls CI image in case caching strategy is "pulled" and the image needs to be pulled
 function push_pull_remove_images::pull_ci_images_if_needed() {
     if [[ "${DOCKER_CACHE}" == "pulled" ]]; then
+        local python_image_hash
+        python_image_hash=$(docker images -q "${AIRFLOW_CI_PYTHON_IMAGE}" 2> /dev/null || true)
+        if [[ -z "${python_image_hash=}" ]]; then
+            FORCE_PULL_IMAGES="true"
+        fi
         if [[ "${FORCE_PULL_IMAGES}" == "true" ]]; then
             echo
             echo "Force pull base image ${PYTHON_BASE_IMAGE}"
@@ -122,6 +127,7 @@ Docker pulling ${PYTHON_BASE_IMAGE}.
                 push_pull_remove_images::pull_image_github_dockerhub "${PYTHON_BASE_IMAGE}" "${GITHUB_REGISTRY_PYTHON_BASE_IMAGE}${PYTHON_TAG_SUFFIX}"
             else
                 docker pull "${AIRFLOW_CI_PYTHON_IMAGE}"
+                docker tag "${AIRFLOW_CI_PYTHON_IMAGE}" "${PYTHON_BASE_IMAGE}"
             fi
             echo
         fi