From f0cf36ceeca2738586d0384caef7a25e272b9f91 Mon Sep 17 00:00:00 2001 From: Bassam Tabbara Date: Fri, 21 Jul 2017 22:51:04 -0700 Subject: [PATCH] fix: fix save image test --- images/rook/Makefile | 3 ++- images/toolbox/Makefile | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/images/rook/Makefile b/images/rook/Makefile index ff73eae54..661008746 100755 --- a/images/rook/Makefile +++ b/images/rook/Makefile @@ -76,7 +76,8 @@ do.build: rook-base-image @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(ROOKD_BASE_IMAGE)|g' Dockerfile @docker build $(BUILD_ARGS) -t $(ROOKD_IMAGE) $(TEMP) @[ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ] && docker rmi $(OLD_IMAGE_ID) || true - @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ]; then \ + @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] || [ -n "$(OLD_IMAGE_ID)" ]; then \ + echo === saving image $(ROOKD_IMAGE); \ mkdir -p $(IMAGE_OUTPUT_DIR); \ docker save $(ROOKD_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ fi diff --git a/images/toolbox/Makefile b/images/toolbox/Makefile index 689925644..5f539b157 100644 --- a/images/toolbox/Makefile +++ b/images/toolbox/Makefile @@ -42,7 +42,8 @@ do.build: toolbox-base-image @cd $(TEMP) && $(SED_CMD) 's|BASEIMAGE|$(TOOLBOX_BASE_IMAGE)|g' Dockerfile @docker build $(BUILD_ARGS) -t $(TOOLBOX_IMAGE) $(TEMP) @[ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ] && docker rmi $(OLD_IMAGE_ID) || true - @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] && [ -n "$(OLD_IMAGE_ID)" ]; then \ + @if [ ! -e "$(IMAGE_FILENAME)" ] || [ "$(OLD_IMAGE_ID)" != "$(CURRENT_IMAGE_ID)" ] || [ -z "$(OLD_IMAGE_ID)" ]; then \ + echo === saving image $(TOOLBOX_IMAGE); \ mkdir -p $(IMAGE_OUTPUT_DIR); \ docker save $(TOOLBOX_IMAGE) | gzip -c > $(IMAGE_FILENAME); \ fi