[ARVADOS] updated: 7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd

[git at public.curoverse.com]

Summary of changes:
 docker/Makefile               |   19 ++++++++++++-------
 docker/mkimage-debootstrap.sh |    8 ++++----
 2 files changed, 16 insertions(+), 11 deletions(-)

       via  7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd (commit)
      from  c8471ae15fddf918fd77045491aca20b3371b3d0 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit 7546b1b3ffb7ef649333c04c58eec6cdb7dd7ddd
Author: Tim Pierce <twp at clinicalfuture.com>
Date:   Mon Jan 6 18:02:39 2014 -0500

    Use docker build -q to fix Docker build failures.
    (see https://github.com/dotcloud/docker/issues/3172)
    
    Also fix deprecated `docker tag' statements in mkimage-debootstrap.sh.

diff --git a/docker/Makefile b/docker/Makefile
index 45ffe5e..6248e0a 100644
--- a/docker/Makefile
+++ b/docker/Makefile
@@ -92,33 +92,38 @@ $(WAREHOUSE_GENERATED): config.yml $(WAREHOUSE_GENERATED_IN)
 $(SSO_GENERATED): config.yml $(SSO_GENERATED_IN)
 	./config.rb
 
+# The docker build -q option suppresses verbose build output.
+# Necessary to prevent failure on building warehouse; see
+# https://github.com/dotcloud/docker/issues/3172
+DOCKER_BUILD = docker build -q
+
 # ============================================================
 # The main Arvados servers: api, doc, workbench, warehouse
 
 api-image: passenger-image $(API_DEPS)
 	mkdir -p api/generated
 	tar -c -z -f api/generated/api.tar.gz -C ../services api
-	docker build -t arvados/api api
+	$(DOCKER_BUILD) -t arvados/api api
 	echo -n "Built at $(date)" > api-image
 
 doc-image: base-image $(DOC_DEPS)
 	mkdir -p doc/generated
 	tar -c -z -f doc/generated/doc.tar.gz -C .. doc
-	docker build -t arvados/doc doc
+	$(DOCKER_BUILD) -t arvados/doc doc
 	echo -n "Built at $(date)" > doc-image
 
 workbench-image: passenger-image $(WORKBENCH_DEPS)
 	mkdir -p workbench/generated
 	tar -c -z -f workbench/generated/workbench.tar.gz -C ../apps workbench
-	docker build -t arvados/workbench workbench
+	$(DOCKER_BUILD) -t arvados/workbench workbench
 	echo -n "Built at $(date)" > workbench-image
 
 warehouse-image: base-image $(WAREHOUSE_DEPS)
-	docker build -t arvados/warehouse warehouse
+	$(DOCKER_BUILD) -t arvados/warehouse warehouse
 	echo -n "Built at $(date)" > warehouse-image
 
 sso-image: passenger-image $(SSO_DEPS)
-	docker build -t arvados/sso sso
+	$(DOCKER_BUILD) -t arvados/sso sso
 	echo -n "Built at $(date)" > sso-image
 
 # ============================================================
@@ -126,11 +131,11 @@ sso-image: passenger-image $(SSO_DEPS)
 # that are dependencies for every Arvados service.
 
 passenger-image: base-image
-	docker build -t arvados/passenger passenger
+	$(DOCKER_BUILD) -t arvados/passenger passenger
 	echo -n "Built at $(date)" > passenger-image
 
 base-image: debian-image $(BASE_DEPS)
-	docker build -t arvados/base base
+	$(DOCKER_BUILD) -t arvados/base base
 	echo -n "Built at $(date)" > base-image
 
 debian-image:
diff --git a/docker/mkimage-debootstrap.sh b/docker/mkimage-debootstrap.sh
index 4ae1f0b..a078801 100755
--- a/docker/mkimage-debootstrap.sh
+++ b/docker/mkimage-debootstrap.sh
@@ -202,25 +202,25 @@ else
 			Debian)
 				if [ "$suite" = "$debianStable" -o "$suite" = 'stable' ] && [ -r etc/debian_version ]; then
 					# tag latest
-					$docker tag $repo:$suite $repo latest
+					$docker tag $repo:$suite $repo:latest
 					
 					if [ -r etc/debian_version ]; then
 						# tag the specific debian release version (which is only reasonable to tag on debian stable)
 						ver=$(cat etc/debian_version)
-						$docker tag $repo:$suite $repo $ver
+						$docker tag $repo:$suite $repo:$ver
 					fi
 				fi
 				;;
 			Ubuntu)
 				if [ "$suite" = "$ubuntuLatestLTS" ]; then
 					# tag latest
-					$docker tag $repo:$suite $repo latest
+					$docker tag $repo:$suite $repo:latest
 				fi
 				if [ -r etc/lsb-release ]; then
 					lsbRelease="$(. etc/lsb-release && echo "$DISTRIB_RELEASE")"
 					if [ "$lsbRelease" ]; then
 						# tag specific Ubuntu version number, if available (12.04, etc.)
-						$docker tag $repo:$suite $repo $lsbRelease
+						$docker tag $repo:$suite $repo:$lsbRelease
 					fi
 				fi
 				;;

-----------------------------------------------------------------------


hooks/post-receive
--