Skip to content

Commit b9fe218

Browse files
author
Matthew Fisher
committed
chore(builder): migrate to cedar-14 stack
With quantal coming out-of-support, heroku implemented the cedar-14 stack. This stack is what's used on heroku in production today AFAIK. Migrating over to this stack makes us more compatible with Heroku.
1 parent 8b49d81 commit b9fe218

5 files changed

Lines changed: 9 additions & 9 deletions

File tree

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff 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
5252
RUN 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

builder/bin/boot

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -56,10 +56,10 @@ done
5656
# HACK: load progrium/cedarish tarball for faster boot times
5757
# see https://github.com/deis/deis/issues/1027
5858
if ! 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
6161
else
62-
echo "Cedarish already loaded"
62+
echo "Cedarish already loaded"
6363
fi
6464

6565
# build required images

builder/slugbuilder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM progrium/cedarish:cedar
1+
FROM progrium/cedarish:latest
22
MAINTAINER OpDemand <info@opdemand.com>
33

44
RUN mkdir /app

builder/slugbuilder/builder/build.sh

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ cp -r $app_dir/. $build_root
5555
export APP_DIR="$app_dir"
5656
export HOME="$app_dir"
5757
export REQUEST_ID=$(openssl rand -base64 32)
58-
export STACK=cedar
58+
export STACK=cedar-14
5959

6060
## Buildpack detection
6161

@@ -106,9 +106,9 @@ fi
106106
## Produce slug
107107

108108
if [[ -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
110110
else
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
112112
fi
113113

114114
if [[ "$slug_file" != "-" ]]; then

builder/slugrunner/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM progrium/cedarish:cedar
1+
FROM progrium/cedarish:latest
22
MAINTAINER OpDemand <info@opdemand.com>
33

44
RUN mkdir /app

0 commit comments

Comments
 (0)