download buildstep container instead of build it

This commit is contained in:
Jeff Lindsay
2013-06-09 19:42:06 -07:00
parent afc567fb91
commit 90e3e9ce2f
3 changed files with 15 additions and 14 deletions

View File

@@ -52,8 +52,8 @@ You're done!
## Advanced installation (for development) ## Advanced installation (for development)
The bootstrap script allows source git repository URLs to be overridden to include customizations from your own The bootstrap script allows source URLs to be overridden to include customizations from your own
repositories. The GITRECEIVE_URL, BUILDSTEP_REPO and DOKKU_REPO environment variables repositories. The GITRECEIVE_URL, BUILDSTEP_URL, BUILDSTEP_CONTAINER and DOKKU_REPO environment variables
may be set to override the defaults (see the bootstrap.sh script for how these apply): may be set to override the defaults (see the bootstrap.sh script for how these apply):
Example: Example:

View File

@@ -1,8 +1,9 @@
# Repository locations - set environment variables to override defaults # Source locations - set environment variables to override defaults
# e.g. OVERRIDE_DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh # e.g. DOKKU_REPO=https://github.com/yourusername/dokku.git bootstrap.sh
GITRECEIVE_URL=${GITRECEIVE_URL:-"https://raw.github.com/progrium/gitreceive/master/gitreceive"}
BUILDSTEP_REPO=${BUILDSTEP_REPO:-"https://github.com/progrium/buildstep.git"}
DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"} DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}
GITRECEIVE_URL=${GITRECEIVE_URL:-"https://raw.github.com/progrium/gitreceive/master/gitreceive"}
BUILDSTEP_URL=${BUILDSTEP_URL:-"https://raw.github.com/progrium/buildstep/master/buildstep"}
BUILDSTEP_CONTAINER=${BUILDSTEP_CONTAINER:-"progrium/buildstep"}
# Docker and base dependencies # Docker and base dependencies
apt-get install -y linux-image-extra-`uname -r` apt-get install -y linux-image-extra-`uname -r`
@@ -12,18 +13,19 @@ apt-get update
apt-get install -y lxc-docker apt-get install -y lxc-docker
apt-get install -y git ruby nginx make apt-get install -y git ruby nginx make
# gitreceive # install and init gitreceive
cd /usr/local/bin cd /usr/local/bin
wget ${GITRECEIVE_URL} wget ${GITRECEIVE_URL}
chmod +x gitreceive chmod +x gitreceive
gitreceive init gitreceive init
# buildstep # install buildstep script
cd ~ cd /home/git
git clone ${BUILDSTEP_REPO} wget ${BUILDSTEP_URL}
cd buildstep chmod +x buildstep
cp buildstep /home/git/buildstep
make # fetch prebuilt buildstep container
docker pull ${BUILDSTEP_CONTAINER}
# dokku (this!) # dokku (this!)
cd ~ cd ~

View File

@@ -9,7 +9,6 @@ echo "-----> Build complete!"
echo "-----> Deploying $APP ..." echo "-----> Deploying $APP ..."
$HOME/deploystep $APP $CONTAINER $HOME/deploystep $APP $CONTAINER
echo
echo "-----> Application deployed:" echo "-----> Application deployed:"
echo " http://$(< "$HOME/$APP/HOSTNAME")" echo " http://$(< "$HOME/$APP/HOSTNAME")"
echo echo