Merge pull request #1975 from bacongobbler/cedar-14

chore(builder): migrate to cedar-14 stack

Author: Matthew Fisher

builder/Dockerfile

@@ -50,7 +50,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 curl -#SL -o /progrium_cedarish.tar \
-    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
+    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_10_01.tar
 
 # define the execution environment
 # use VOLUME to remove /var/lib/docker from copy-on-write for performance

builder/bin/boot

@@ -56,10 +56,10 @@ done
 # HACK: load progrium/cedarish tarball for faster boot times
 # 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
+    echo "Loading cedarish..."
+    docker load -i /progrium_cedarish.tar
 else
-	echo "Cedarish already loaded"
+    echo "Cedarish already loaded"
 fi
 
 # build required images

builder/slugbuilder/Dockerfile

@@ -1,4 +1,4 @@
-FROM progrium/cedarish:cedar
+FROM progrium/cedarish:latest
 MAINTAINER OpDemand <info@opdemand.com>
 
 RUN mkdir /app

builder/slugbuilder/builder/build.sh

@@ -55,7 +55,7 @@ cp -r $app_dir/. $build_root
 export APP_DIR="$app_dir"
 export HOME="$app_dir"
 export REQUEST_ID=$(openssl rand -base64 32)
-export STACK=cedar
+export STACK=cedar-14
 
 ## Buildpack detection
 
@@ -106,9 +106,9 @@ fi
 ## Produce slug
 
 if [[ -f "$build_root/.slugignore" ]]; then
-	tar --exclude='.git' --use-compress-program=pigz -X "$build_root/.slugignore" -C $build_root -cf $slug_file . | cat
+	tar --exclude='.git' -X "$build_root/.slugignore" -C $build_root -cf $slug_file . | cat
 else
-	tar --exclude='.git' --use-compress-program=pigz -C $build_root -cf $slug_file . | cat
+	tar --exclude='.git' -C $build_root -cf $slug_file . | cat
 fi
 
 if [[ "$slug_file" != "-" ]]; then

builder/slugbuilder/builder/install-buildpacks

@@ -16,20 +16,15 @@ 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           v126
+download_buildpack https://github.com/ddollar/heroku-buildpack-multi.git         9350571
+download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git           v127
 download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git         v60
-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-java.git           v28
+download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git         743f73c
 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-play.git           ceede86
 download_buildpack https://github.com/heroku/heroku-buildpack-python.git         v52
 download_buildpack https://github.com/heroku/heroku-buildpack-php.git            v43
-download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git        v7
-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          52f689d
-download_buildpack https://github.com/igrigorik/heroku-buildpack-dart.git        c492c52
-download_buildpack https://github.com/rhy-jot/buildpack-nginx.git                f914a3d
-download_buildpack https://github.com/Kloadut/heroku-buildpack-static-apache.git f65c835
+download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git        bc2bfd8
+download_buildpack https://github.com/heroku/heroku-buildpack-scala.git          v41
+download_buildpack https://github.com/heroku/heroku-buildpack-go.git             b261aab

builder/slugrunner/Dockerfile

@@ -1,4 +1,4 @@
-FROM progrium/cedarish:cedar
+FROM progrium/cedarish:latest
 MAINTAINER OpDemand <info@opdemand.com>
 
 RUN mkdir /app