fix: fix save image test

This commit is contained in:
Bassam Tabbara committed 2017-07-21 22:51:04 -07:00
1 parent a9d4f68a8d
commit f0cf36ceec
2 files changed
+4 -2

No files matched your search

+2 -1
View File
@@ -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
+2 -1
View File
@@ -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