From 55ca88ed82da9aa2463b876eb8d51797f5c8207b Mon Sep 17 00:00:00 2001
From: Ivan Mikushin <i.mikushin@gmail.com>
Date: Tue, 28 Jul 2015 13:10:09 +0500
Subject: [PATCH] do not pull os-images by default if they exist

also, cleanup os-initrdbase container on exit in ./scripts/copy-images
(as trap can apparently only run one command)
---
 Makefile            | 5 +++--
 scripts/copy-images | 1 +
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 49229333..56e1a2ca 100644
--- a/Makefile
+++ b/Makefile
@@ -2,6 +2,7 @@
 DOCKER_BINARY_URL := https://github.com/rancher/docker/releases/download/v1.7.1-ros-1/docker-1.7.1
 
 
+FORCE_PULL   := 0
 DOCKER_BINARY := $(shell basename $(DOCKER_BINARY_URL))
 pwd := $(shell pwd)
 include scripts/build-common
@@ -56,7 +57,7 @@ INITRD_DIR := $(BUILD)/initrd
 
 $(INITRD_DIR)/images.tar: bin/rancheros
 	ln -sf bin/rancheros ./ros
-	for i in `./ros c images -i os-config.yml`; do docker pull $$i; done
+	for i in `./ros c images -i os-config.yml`; do [ "$(FORCE_PULL)" != "1" ] && docker inspect $$i >/dev/null 2>&1 || docker pull $$i; done
 	docker save `./ros c images -i os-config.yml` > $@
 
 
@@ -100,7 +101,7 @@ bin/rancheros:
 .PHONY: bin/rancheros
 
 package:
-	@echo make $@ | make docker-run
+	@echo make FORCE_PULL=$(FORCE_PULL) $@ | make docker-run
 	docker cp ros-build:/go/src/github.com/rancherio/os/bin/rancheros bin
 	docker cp ros-build:/go/src/github.com/rancherio/os/dist/artifacts dist
 
diff --git a/scripts/copy-images b/scripts/copy-images
index 26e7e520..ab98ce6a 100755
--- a/scripts/copy-images
+++ b/scripts/copy-images
@@ -20,6 +20,7 @@ docker cp ${CONTAINER_INITRDBASE}:/initrd ${BUILD} # copies files to ${BUILD}/in
 
 CONTAINER_KERNEL=$(docker create rancher/os-kernel:${VERSION})
 cleanup_kernel() {
+    cleanup_initrdbase
     docker rm -v ${CONTAINER_KERNEL}
 }
 trap cleanup_kernel EXIT