Skip to content

Commit c7786c4

Browse files
author
Matthew Fisher
committed
Merge pull request #3324 from bacongobbler/update-buildpack-ruby-134
chore(builder): bump heroku-buildpack-ruby to v134
2 parents cadcc02 + 0191bbd commit c7786c4

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

builder/image/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ RUN chown -R $GITUSER:$GITUSER $GITHOME
4141
# HACK: import progrium/cedarish as a tarball
4242
# see https://github.com/deis/deis/issues/1027
4343
RUN curl -#SL -o /progrium_cedarish.tar.gz \
44-
https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014_12_15.tar.gz
44+
https://github.com/progrium/cedarish/releases/download/v3/cedarish-cedar14_v3.tar.gz
4545

4646
# define the execution environment
4747
# use VOLUME to remove /var/lib/docker from copy-on-write for performance

builder/image/bin/boot

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ done
6666
# see https://github.com/deis/deis/issues/1027
6767
if ! docker history progrium/cedarish >/dev/null 2>/dev/null ; then
6868
echo "Loading cedarish..."
69-
gzip -dc /progrium_cedarish.tar.gz | docker load
69+
cat /progrium_cedarish.tar.gz | docker import - progrium/cedarish
7070
else
7171
echo "Cedarish already loaded"
7272
fi

builder/image/slugbuilder/builder/install-buildpacks

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ download_buildpack() {
2929
mkdir -p $BUILDPACK_INSTALL_PATH
3030

3131
download_buildpack https://github.com/ddollar/heroku-buildpack-multi.git 6e79094
32-
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v129
32+
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v134
3333
download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git v64
3434
download_buildpack https://github.com/heroku/heroku-buildpack-java.git v32
3535
download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git v12

0 commit comments

Comments
 (0)