File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ RUN echo "%git ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
5050# HACK: import progrium/cedarish as a tarball
5151# see https://github.com/deis/deis/issues/1027
5252RUN curl -#SL -o /progrium_cedarish.tar \
53- https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar .tar
53+ https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_10_01 .tar
5454
5555# define the execution environment
5656# use VOLUME to remove /var/lib/docker from copy-on-write for performance
Original file line number Diff line number Diff line change 5656# HACK: load progrium/cedarish tarball for faster boot times
5757# see https://github.com/deis/deis/issues/1027
5858if ! docker history progrium/cedarish > /dev/null 2> /dev/null ; then
59- echo " Loading cedarish..."
60- docker load -i /progrium_cedarish.tar
59+ echo " Loading cedarish..."
60+ docker load -i /progrium_cedarish.tar
6161else
62- echo " Cedarish already loaded"
62+ echo " Cedarish already loaded"
6363fi
6464
6565# build required images
Original file line number Diff line number Diff line change 1- FROM progrium/cedarish:cedar
1+ FROM progrium/cedarish:latest
22MAINTAINER OpDemand <info@opdemand.com>
33
44RUN mkdir /app
Original file line number Diff line number Diff line change @@ -55,7 +55,7 @@ cp -r $app_dir/. $build_root
5555export APP_DIR=" $app_dir "
5656export HOME=" $app_dir "
5757export REQUEST_ID=$( openssl rand -base64 32)
58- export STACK=cedar
58+ export STACK=cedar-14
5959
6060# # Buildpack detection
6161
106106# # Produce slug
107107
108108if [[ -f " $build_root /.slugignore" ]]; then
109- tar --exclude=' .git' --use-compress-program=pigz - X " $build_root /.slugignore" -C $build_root -cf $slug_file . | cat
109+ tar --exclude=' .git' -X " $build_root /.slugignore" -C $build_root -cf $slug_file . | cat
110110else
111- tar --exclude=' .git' --use-compress-program=pigz - C $build_root -cf $slug_file . | cat
111+ tar --exclude=' .git' -C $build_root -cf $slug_file . | cat
112112fi
113113
114114if [[ " $slug_file " != " -" ]]; then
Original file line number Diff line number Diff line change 1- FROM progrium/cedarish:cedar
1+ FROM progrium/cedarish:latest
22MAINTAINER OpDemand <info@opdemand.com>
33
44RUN mkdir /app
You can’t perform that action at this time.
0 commit comments