File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -59,7 +59,7 @@ Deis stands on the shoulders of leading open source technologies:
5959 * [ Django] ( https://www.djangoproject.com/ )
6060 * [ Celery] ( http://www.celeryproject.org/ )
6161 * [ Heroku Buildpacks] ( https://devcenter.heroku.com/articles/buildpacks )
62- * [ Buildstep ] ( https://github.com/progrium/buildstep )
62+ * [ Slugbuilder ] ( https://github.com/flynn/slugbuilder ) and [ slugrunner ] ( https://github.com/flynn/slugrunner )
6363 * [ Gitosis] ( https://github.com/opdemand/gitosis )
6464
6565## License and Authors
Original file line number Diff line number Diff line change @@ -710,7 +710,7 @@ class Build(UuidAuditedModel):
710710 sha = models .CharField ('SHA' , max_length = 255 , blank = True )
711711 output = models .TextField (blank = True )
712712
713- image = models .CharField (max_length = 256 , default = 'deis/buildstep ' )
713+ image = models .CharField (max_length = 256 , default = 'deis/slugbuilder ' )
714714
715715 procfile = JSONField (blank = True )
716716 dockerfile = models .TextField (blank = True )
Original file line number Diff line number Diff line change @@ -49,14 +49,15 @@ apt-get update
4949apt-get -qy upgrade
5050
5151# install required packages
52- apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq
53-
54- # create buildstep docker image
55- git clone -b deis https://github.com/opdemand/buildstep.git
56- cd buildstep
57- make
58- cd ..
59- rm -rf buildstep
52+ apt-get install lxc-docker-0.7.1 curl git make python-setuptools python-pip -yq
53+
54+ # wait for docker to start
55+ while [ ! -e /var/run/docker.sock ] ; do
56+ inotifywait -t 2 -e create $( dirname /var/run/docker.sock)
57+ done
58+
59+ # pull progrium/cedarish docker image
60+ docker pull progrium/cedarish
6061
6162# install chef 11.x deps
6263apt-get install -yq ruby1.9.1 ruby1.9.1-dev make
You can’t perform that action at this time.
0 commit comments