chore(builder): pin cedarish to cedar stack

Author: Matthew Fisher

builder/Dockerfile

@@ -38,7 +38,7 @@ 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 wget -O /progrium_cedarish.tar --progress=dot:giga \
-        https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014.08.14.tar
+        https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
 
 # define the execution environment
 VOLUME /var/lib/docker

builder/bin/boot

@@ -62,17 +62,9 @@ else
 	echo "Cedarish already loaded"
 fi
 
-# pull required images
-
-# Custom slugbuilder?
-SLUGBUILDER=`etcdctl --no-sync -C $ETCD get /deis/slugbuilder/image 2>/dev/null || etcdctl --no-sync -C $ETCD mk /deis/slugbuilder/image deis/slugbuilder:latest 2>/dev/null`
-docker pull ${SLUGBUILDER}
-docker tag  ${SLUGBUILDER} deis/slugbuilder:latest
-
-# Custom slugrunner?
-SLUGRUNNER=`etcdctl --no-sync -C $ETCD get /deis/slugrunner/image 2>/dev/null || etcdctl --no-sync -C $ETCD mk /deis/slugrunner/image deis/slugrunner:latest 2>/dev/null`
-docker pull ${SLUGRUNNER}
-docker tag  ${SLUGRUNNER} deis/slugrunner:latest
+# build required images
+docker build -t deis/slugbuilder /app/slugbuilder/
+docker build -t deis/slugrunner /app/slugrunner/
 
 # start an SSH daemon to process `git push` requests
 /usr/sbin/sshd -D -e &

builder/slugbuilder/Dockerfile

@@ -1,4 +1,4 @@
-FROM progrium/cedarish
+FROM progrium/cedarish:cedar
 MAINTAINER OpDemand <info@opdemand.com>
 
 RUN useradd slugbuilder --home-dir /app

builder/slugbuilder/builder/install-buildpacks

@@ -17,19 +17,19 @@ download_buildpack() {
 mkdir -p $BUILDPACK_INSTALL_PATH
 
 download_buildpack https://github.com/ddollar/heroku-buildpack-multi.git         d5b4b97
-download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git           v121
+download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git           v126
 download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git         v60
-download_buildpack https://github.com/heroku/heroku-buildpack-java.git           586a075
-download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git         0d14592
+download_buildpack https://github.com/heroku/heroku-buildpack-java.git           b7e7b29
+download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git         e6c2297
 download_buildpack https://github.com/heroku/heroku-buildpack-grails.git         1ef927d
 download_buildpack https://github.com/heroku/heroku-buildpack-play.git           420fb6a
-download_buildpack https://github.com/heroku/heroku-buildpack-python.git         v41
+download_buildpack https://github.com/heroku/heroku-buildpack-python.git         v52
 download_buildpack https://github.com/deis/heroku-buildpack-php.git              14ee155
 download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git        v7
-download_buildpack https://github.com/kr/heroku-buildpack-go.git                 98109e2
-download_buildpack https://github.com/oortcloud/heroku-buildpack-meteorite.git   5fea1e3
+download_buildpack https://github.com/kr/heroku-buildpack-go.git                 b261aab
+download_buildpack https://github.com/oortcloud/heroku-buildpack-meteorite.git   76efa5c
 download_buildpack https://github.com/miyagawa/heroku-buildpack-perl.git         2da7480
-download_buildpack https://github.com/heroku/heroku-buildpack-scala.git          2ece3bd
+download_buildpack https://github.com/heroku/heroku-buildpack-scala.git          52f689d
 download_buildpack https://github.com/igrigorik/heroku-buildpack-dart.git        c492c52
-download_buildpack https://github.com/rhy-jot/buildpack-nginx.git                0433970
+download_buildpack https://github.com/rhy-jot/buildpack-nginx.git                f914a3d
 download_buildpack https://github.com/Kloadut/heroku-buildpack-static-apache.git f65c835

builder/slugrunner/Dockerfile

@@ -1,5 +1,5 @@
-FROM progrium/cedarish
-MAINTAINER Jonathan Rudenberg <jonathan@titanous.com>
+FROM progrium/cedarish:cedar
+MAINTAINER OpDemand <info@opdemand.com>
 
 ADD ./runner /runner
 ENTRYPOINT ["/runner/init"]