ref(*/Makefile): copy Godeps as needed for docker builds

Author: mboersma

.gitignore

@@ -21,7 +21,16 @@ controller/.secret_key
 # application logs
 logs/
 
-# local binaries and installers
+# local binaries, installers, and artifacts
+builder/Godeps/
+builder/image/bin/extract-domain
+builder/image/bin/extract-types
+builder/image/bin/extract-version
+builder/image/bin/generate-buildhook
+builder/image/bin/get-app-config
+builder/image/bin/get-app-values
+builder/image/bin/publish-release-controller
+builder/image/bin/yaml2json-procfile
 client/dist/
 client/makeself/
 contrib/bumpver/bumpver
@@ -32,6 +41,9 @@ deisctl/makeself/
 docs/_build/
 docs/docs.zip
 logspout/build/
+logspout/Godeps/
+publisher/Godeps/
+router/parent/Godeps/
 
 # coverage reports
 .coverage

builder/Makefile

@@ -7,6 +7,7 @@ BUILD_IMAGE := $(COMPONENT)-build
 BINARY_DEST_DIR := image/bin
 
 build: check-docker
+	cp -pR ../Godeps .
 	docker build -t $(BUILD_IMAGE) .
 	docker cp `docker create $(BUILD_IMAGE)`:/go/bin/extract-domain $(BINARY_DEST_DIR)/
 	docker cp `docker create $(BUILD_IMAGE)`:/go/bin/extract-types $(BINARY_DEST_DIR)/
@@ -17,17 +18,17 @@ build: check-docker
 	docker cp `docker create $(BUILD_IMAGE)`:/go/bin/publish-release-controller $(BINARY_DEST_DIR)/
 	docker cp `docker create $(BUILD_IMAGE)`:/go/bin/yaml2json-procfile $(BINARY_DEST_DIR)/
 	docker build -t $(IMAGE) image
-	rm $(BINARY_DEST_DIR)/extract-domain
-	rm $(BINARY_DEST_DIR)/extract-types
-	rm $(BINARY_DEST_DIR)/extract-version
-	rm $(BINARY_DEST_DIR)/generate-buildhook
-	rm $(BINARY_DEST_DIR)/get-app-config
-	rm $(BINARY_DEST_DIR)/get-app-values
-	rm $(BINARY_DEST_DIR)/publish-release-controller
-	rm $(BINARY_DEST_DIR)/yaml2json-procfile
 
 clean: check-docker check-registry
-	rm -f deisctl
+	rm -rf Godeps
+	rm -f $(BINARY_DEST_DIR)/extract-domain
+	rm -f $(BINARY_DEST_DIR)/extract-types
+	rm -f $(BINARY_DEST_DIR)/extract-version
+	rm -f $(BINARY_DEST_DIR)/generate-buildhook
+	rm -f $(BINARY_DEST_DIR)/get-app-config
+	rm -f $(BINARY_DEST_DIR)/get-app-values
+	rm -f $(BINARY_DEST_DIR)/publish-release-controller
+	rm -f $(BINARY_DEST_DIR)/yaml2json-procfile
 	docker rmi $(IMAGE)
 
 full-clean: check-docker check-registry clean

logspout/Makefile

@@ -7,12 +7,14 @@ RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
 DEV_DOCKER_IMAGE := $(DEV_REGISTRY)/$(RELEASE_IMAGE)
 
 build: check-docker
+	cp -pR ../Godeps .
 	docker build -t $(BUILD_IMAGE) .
 	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/logspout image/
 	docker build -t $(RELEASE_IMAGE) image
 	rm -rf image/logspout
 
 clean: check-docker check-registry
+	rm -rf Godeps
 	docker rmi $(RELEASE_IMAGE) $(BUILD_IMAGE)
 
 full-clean: check-docker check-registry

publisher/Makefile

@@ -6,12 +6,14 @@ RELEASE_IMAGE := $(DOCKER_IMAGE):$(BUILD_TAG)
 REMOTE_IMAGE := $(REGISTRY)/$(RELEASE_IMAGE)
 
 build: check-docker
+	cp -pR ../Godeps .
 	docker build -t $(BUILD_IMAGE) .
 	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/publisher image/
 	docker build -t $(RELEASE_IMAGE) image
 	rm -rf image/publisher
 
 clean: check-docker check-registry
+	rm -rf Godeps
 	docker rmi $(RELEASE_IMAGE) $(REMOTE_IMAGE)
 
 full-clean: check-docker check-registry
@@ -32,7 +34,7 @@ set-image: check-deisctl
 
 release: check-docker
 	docker push $(DOCKER_IMAGE)
-	
+
 deploy: build dev-release restart
 
 restart: stop start

router/Makefile

@@ -6,6 +6,7 @@ DEV_IMAGE = $(DEV_REGISTRY)/$(IMAGE)
 BUILD_IMAGE = $(COMPONENT)-build
 
 build: check-docker
+	cp -pR ../Godeps parent/
 	docker build -t $(BUILD_IMAGE) parent
 	docker cp `docker run -d $(BUILD_IMAGE)`:/nginx.tgz `pwd`
 	docker cp `docker run -d $(BUILD_IMAGE)`:/go/bin/boot bin/
@@ -14,6 +15,7 @@ build: check-docker
 	rm bin/boot
 
 clean: check-docker check-registry
+	rm -rf parent/Godeps
 	docker rmi $(IMAGE)
 
 full-clean: check-docker check-registry