Skip to content
This repository has been archived by the owner on Nov 30, 2021. It is now read-only.

Commit

Permalink
Updated DigitalOcean snapshot script in line with other providers.
Browse files Browse the repository at this point in the history
  • Loading branch information
mboersma committed Dec 31, 2013
1 parent 2b4a8db commit f22a6e5
Show file tree
Hide file tree
Showing 3 changed files with 11 additions and 10 deletions.
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ Deis stands on the shoulders of leading open source technologies:
* [Django](https://www.djangoproject.com/)
* [Celery](http://www.celeryproject.org/)
* [Heroku Buildpacks](https://devcenter.heroku.com/articles/buildpacks)
* [Buildstep](https://github.com/progrium/buildstep)
* [Slugbuilder](https://github.com/flynn/slugbuilder) and [slugrunner](https://github.com/flynn/slugrunner)
* [Gitosis](https://github.com/opdemand/gitosis)

## License and Authors
Expand Down
2 changes: 1 addition & 1 deletion api/models.py
Original file line number Diff line number Diff line change
Expand Up @@ -710,7 +710,7 @@ class Build(UuidAuditedModel):
sha = models.CharField('SHA', max_length=255, blank=True)
output = models.TextField(blank=True)

image = models.CharField(max_length=256, default='deis/buildstep')
image = models.CharField(max_length=256, default='deis/slugbuilder')

procfile = JSONField(blank=True)
dockerfile = models.TextField(blank=True)
Expand Down
17 changes: 9 additions & 8 deletions contrib/digitalocean/prepare-digitalocean-snapshot.sh
Original file line number Diff line number Diff line change
Expand Up @@ -49,14 +49,15 @@ apt-get update
apt-get -qy upgrade

# install required packages
apt-get install lxc-docker-0.6.4 curl git make python-setuptools python-pip -yq

# create buildstep docker image
git clone -b deis https://github.com/opdemand/buildstep.git
cd buildstep
make
cd ..
rm -rf buildstep
apt-get install lxc-docker-0.7.1 curl git make python-setuptools python-pip -yq

# wait for docker to start
while [ ! -e /var/run/docker.sock ] ; do
inotifywait -t 2 -e create $(dirname /var/run/docker.sock)
done

# pull progrium/cedarish docker image
docker pull progrium/cedarish

# install chef 11.x deps
apt-get install -yq ruby1.9.1 ruby1.9.1-dev make
Expand Down

0 comments on commit f22a6e5

Please sign in to comment.