Merge pull request #2754 from bacongobbler/compress-cedarish-image

feat(builder): compress progrium/cedarish

Author: Matthew Fisher

.editorconfig

@@ -10,5 +10,8 @@ insert_final_newline = true
 indent_style = space
 indent_size = 4
 
+[Makefile]
+indent_style = tab
+
 [*.go]
 indent_style = tab

builder/.dockerignore

@@ -0,0 +1 @@
+build

builder/Makefile

@@ -72,3 +72,8 @@ test-unit:
 test-functional:
 	@docker history deis/test-etcd >/dev/null 2>&1 || docker pull deis/test-etcd:latest
 	GOPATH=`cd ../tests/ && godep path`:$(GOPATH) go test -v ./tests/...
+
+cedarish/build:
+	mkdir -p build
+	docker pull progrium/cedarish:latest
+	docker save progrium/cedarish:latest | gzip -9 > build/progrium_cedarish_$(shell date "+%Y_%m_%d").tar.gz

builder/image/Dockerfile

@@ -43,8 +43,8 @@ RUN echo "%git    ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
 
 # HACK: import progrium/cedarish as a tarball
 # see https://github.com/deis/deis/issues/1027
-RUN curl -#SL -o /progrium_cedarish.tar \
-    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_10_01.tar
+RUN curl -#SL -o /progrium_cedarish.tar.gz \
+    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_12_15.tar.gz
 
 # define the execution environment
 # use VOLUME to remove /var/lib/docker from copy-on-write for performance

builder/image/bin/boot

@@ -63,7 +63,7 @@ done
 # see https://github.com/deis/deis/issues/1027
 if ! docker history progrium/cedarish >/dev/null 2>/dev/null ; then
     echo "Loading cedarish..."
-    docker load -i /progrium_cedarish.tar
+    gzip -dc /progrium_cedarish.tar.gz | docker load
 else
     echo "Cedarish already loaded"
 fi