rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-07-14 15:14:03 +00:00
Code Issues Releases Wiki Activity

Merge pull request #456 from imikushin/dont-pull-if-exists

Browse Source 
do not pull os-images by default if they exist
This commit is contained in:
Darren Shepherd 2015-07-28 01:41:53 -07:00
commit 4d3e3140ce
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Makefile
View File

@ -2,6 +2,7 @@
DOCKER_BINARY_URL := https://github.com/rancher/docker/releases/download/v1.7.1-ros-1/docker-1.7.1 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)) DOCKER_BINARY := $(shell basename $(DOCKER_BINARY_URL))
pwd := $(shell pwd) pwd := $(shell pwd)
include scripts/build-common include scripts/build-common
@ -56,7 +57,7 @@ INITRD_DIR := $(BUILD)/initrd
$(INITRD_DIR)/images.tar: bin/rancheros $(INITRD_DIR)/images.tar: bin/rancheros
ln -sf bin/rancheros ./ros 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` > $@ docker save `./ros c images -i os-config.yml` > $@
@ -100,7 +101,7 @@ bin/rancheros:
.PHONY: bin/rancheros .PHONY: bin/rancheros
package: 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/bin/rancheros bin
docker cp ros-build:/go/src/github.com/rancherio/os/dist/artifacts dist docker cp ros-build:/go/src/github.com/rancherio/os/dist/artifacts dist

1
scripts/copy-images
View File

@ -20,6 +20,7 @@ docker cp ${CONTAINER_INITRDBASE}:/initrd ${BUILD} # copies files to ${BUILD}/in
CONTAINER_KERNEL=$(docker create rancher/os-kernel:${VERSION}) CONTAINER_KERNEL=$(docker create rancher/os-kernel:${VERSION})
cleanup_kernel() { cleanup_kernel() {
cleanup_initrdbase
docker rm -v ${CONTAINER_KERNEL} docker rm -v ${CONTAINER_KERNEL}
} }
trap cleanup_kernel EXIT trap cleanup_kernel EXIT