You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airflow.apache.org by po...@apache.org on 2020/11/14 16:34:44 UTC

[airflow] 28/44: Fixes "--force-clean-images" flag in Breeze (#12156)

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 815f18b06c8711208971d9766350856d892b695c
Author: Jarek Potiuk <ja...@polidea.com>
AuthorDate: Sat Nov 7 13:51:01 2020 +0100

    Fixes "--force-clean-images" flag in Breeze (#12156)
    
    The flag was broken - bad cache parameter value was passed.
    
    This PR fixes it.
    
    (cherry picked from commit 5c601578194739286097a75f082af2d83539581f)
---
 breeze                                | 2 +-
 scripts/ci/libraries/_build_images.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/breeze b/breeze
index 7838c88..1d8ffea 100755
--- a/breeze
+++ b/breeze
@@ -884,7 +884,7 @@ function breeze::parse_arguments() {
         -C | --force-clean-images)
             echo "Clean build of images without cache"
             echo
-            export DOCKER_CACHE="no-cache"
+            export DOCKER_CACHE="disabled"
             # if not set here, docker cached is determined later, depending on type of image to be build
             readonly DOCKER_CACHE
             export FORCE_BUILD_IMAGES="true"
diff --git a/scripts/ci/libraries/_build_images.sh b/scripts/ci/libraries/_build_images.sh
index a6dbae0..cbd01c1 100644
--- a/scripts/ci/libraries/_build_images.sh
+++ b/scripts/ci/libraries/_build_images.sh
@@ -536,7 +536,7 @@ function build_images::build_ci_image() {
         )
     else
         echo >&2
-        echo >&2 "Error - thee ${DOCKER_CACHE} cache is unknown!"
+        echo >&2 "Error - the ${DOCKER_CACHE} cache is unknown!"
         echo >&2
         exit 1
     fi