openstack
/
fuel-main
Code Issues Proposed changes

Attach docker repo-container cleanup to docker/build.done task 

The artifacts task was not being used in the
dependency chain, so it was not being called.

Cleanup is now in docker/build.done.

Change-Id: I67106496ea2a786ee17bef9fb2e6238b6d22c9cc
Closes-Bug: #1461502
This commit is contained in:
Matthew Mosesohn 2015-08-03 13:28:17 +03:00
parent 7a374fbd1f
commit 758f6fcc14
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
docker/module.mk
View File

@ -5,8 +5,7 @@ REPO_CONTAINER:=fuel-repo-container
docker: $(ARTS_DIR)/$(DOCKER_ART_NAME)
$(ARTS_DIR)/$(DOCKER_ART_NAME): \
$(BUILD_DIR)/docker/build.done \
$(BUILD_DIR)/docker/repo-container-down.done
$(BUILD_DIR)/docker/build.done
mkdir -p $(@D)
cp $(BUILD_DIR)/docker/$(DOCKER_ART_NAME) $@
@ -27,6 +26,7 @@ $(BUILD_DIR)/docker/build.done: \
sudo docker save fuel/centos busybox $(foreach cnt,$(containers), fuel/$(cnt)_$(PRODUCT_VERSION)) > $(BUILD_DIR)/docker/fuel-images.tar
lrzip -L2 -U -D -f $(BUILD_DIR)/docker/fuel-images.tar -o $(BUILD_DIR)/docker/$(DOCKER_ART_NAME)
rm -f $(BUILD_DIR)/docker/fuel-images.tar
sudo docker rm -f "$(REPO_CONTAINER)" || true
$(ACTION.TOUCH)
endif
@ -80,11 +80,6 @@ $(BUILD_DIR)/docker/repo-container-up.done: \
wget -t10 -T1 --waitretry 1 --retry-connrefused --no-proxy http://127.0.0.1:$${REPO_PORT}/os/x86_64/repodata/repomd.xml
$(ACTION.TOUCH)
$(BUILD_DIR)/docker/repo-container-down.done: \
$(BUILD_DIR)/docker/build.done
sudo docker rm -f "$(REPO_CONTAINER)"
$(ACTION.TOUCH)
$(BUILD_DIR)/docker/sources.done: \
$(find-files $(SOURCE_DIR)/docker)
mkdir -p $(BUILD_DIR)/docker/sources $(BUILD_DIR)/docker/utils