Skip to content

Commit 9a692ea

Browse files
author
Matthew Fisher
committed
chore(builder): pin cedarish to cedar stack
1 parent 4b1e6b8 commit 9a692ea

5 files changed

Lines changed: 15 additions & 23 deletions

File tree

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ RUN echo "%git ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
3838
# HACK: import progrium/cedarish as a tarball
3939
# see https://github.com/deis/deis/issues/1027
4040
RUN wget -O /progrium_cedarish.tar --progress=dot:giga \
41-
https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_2014.08.14.tar
41+
https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
4242

4343
# define the execution environment
4444
VOLUME /var/lib/docker

builder/bin/boot

Lines changed: 3 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -62,17 +62,9 @@ else
6262
echo "Cedarish already loaded"
6363
fi
6464

65-
# pull required images
66-
67-
# Custom slugbuilder?
68-
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`
69-
docker pull ${SLUGBUILDER}
70-
docker tag ${SLUGBUILDER} deis/slugbuilder:latest
71-
72-
# Custom slugrunner?
73-
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`
74-
docker pull ${SLUGRUNNER}
75-
docker tag ${SLUGRUNNER} deis/slugrunner:latest
65+
# build required images
66+
docker build -t deis/slugbuilder /app/slugbuilder/
67+
docker build -t deis/slugrunner /app/slugrunner/
7668

7769
# start an SSH daemon to process `git push` requests
7870
/usr/sbin/sshd -D -e &

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
1+
FROM progrium/cedarish:cedar
22
MAINTAINER OpDemand <info@opdemand.com>
33

44
RUN useradd slugbuilder --home-dir /app

builder/slugbuilder/builder/install-buildpacks

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -17,19 +17,19 @@ download_buildpack() {
1717
mkdir -p $BUILDPACK_INSTALL_PATH
1818

1919
download_buildpack https://github.com/ddollar/heroku-buildpack-multi.git d5b4b97
20-
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v121
20+
download_buildpack https://github.com/heroku/heroku-buildpack-ruby.git v126
2121
download_buildpack https://github.com/heroku/heroku-buildpack-nodejs.git v60
22-
download_buildpack https://github.com/heroku/heroku-buildpack-java.git 586a075
23-
download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git 0d14592
22+
download_buildpack https://github.com/heroku/heroku-buildpack-java.git b7e7b29
23+
download_buildpack https://github.com/heroku/heroku-buildpack-gradle.git e6c2297
2424
download_buildpack https://github.com/heroku/heroku-buildpack-grails.git 1ef927d
2525
download_buildpack https://github.com/heroku/heroku-buildpack-play.git 420fb6a
26-
download_buildpack https://github.com/heroku/heroku-buildpack-python.git v41
26+
download_buildpack https://github.com/heroku/heroku-buildpack-python.git v52
2727
download_buildpack https://github.com/deis/heroku-buildpack-php.git 14ee155
2828
download_buildpack https://github.com/heroku/heroku-buildpack-clojure.git v7
29-
download_buildpack https://github.com/kr/heroku-buildpack-go.git 98109e2
30-
download_buildpack https://github.com/oortcloud/heroku-buildpack-meteorite.git 5fea1e3
29+
download_buildpack https://github.com/kr/heroku-buildpack-go.git b261aab
30+
download_buildpack https://github.com/oortcloud/heroku-buildpack-meteorite.git 76efa5c
3131
download_buildpack https://github.com/miyagawa/heroku-buildpack-perl.git 2da7480
32-
download_buildpack https://github.com/heroku/heroku-buildpack-scala.git 2ece3bd
32+
download_buildpack https://github.com/heroku/heroku-buildpack-scala.git 52f689d
3333
download_buildpack https://github.com/igrigorik/heroku-buildpack-dart.git c492c52
34-
download_buildpack https://github.com/rhy-jot/buildpack-nginx.git 0433970
34+
download_buildpack https://github.com/rhy-jot/buildpack-nginx.git f914a3d
3535
download_buildpack https://github.com/Kloadut/heroku-buildpack-static-apache.git f65c835

builder/slugrunner/Dockerfile

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
FROM progrium/cedarish
2-
MAINTAINER Jonathan Rudenberg <jonathan@titanous.com>
1+
FROM progrium/cedarish:cedar
2+
MAINTAINER OpDemand <info@opdemand.com>
33

44
ADD ./runner /runner
55
ENTRYPOINT ["/runner/init"]

0 commit comments

Comments
 (0)