github/dokku
0
0
Fork 0
Code Issues Pull Requests Actions 5 Packages Projects Releases Wiki Activity

hopefully get travis to test this particular branch

Browse Source
This commit is contained in:
Jeff Lindsay
2013-06-30 08:17:34 -05:00
parent 1ee35cb3b9
commit 3ce4897264
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
.travis.yml
View File

@@ -1,5 +1,5 @@
--- ---
script: cd tests && ./run_ec2 test script: cd tests && ./run_ec2 test $TRAVIS_BRANCH
before_install: before_install:
- "sudo apt-get install -y ec2-api-tools" - "sudo apt-get install -y ec2-api-tools"
- "sudo apt-get install -y s3cmd" - "sudo apt-get install -y s3cmd"

4
bootstrap.sh
View File

@@ -1,4 +1,4 @@
DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"} DOKKU_REPO=${DOKKU_REPO:-"https://github.com/progrium/dokku.git"}; DOKKU_BRANCH=${DOKKU_BRANCH:-"master"}
DOKKU_STACK=${DOKKU_STACK:-"https://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz"} DOKKU_STACK=${DOKKU_STACK:-"https://s3.amazonaws.com/progrium-dokku/progrium_buildstep.tgz"}
set -e set -e
@@ -8,7 +8,7 @@ add-apt-repository -y ppa:dotcloud/lxc-docker
apt-get update && apt-get install -y lxc-docker git nginx make curl dnsutils apt-get update && apt-get install -y lxc-docker git nginx make curl dnsutils
cd ~ && git clone ${DOKKU_REPO} cd ~ && git clone ${DOKKU_REPO}
cd dokku && make install cd dokku && git pull origin $DOKKU_BRANCH && make install
curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep curl "$DOKKU_STACK" | gunzip -cd | docker import - progrium/buildstep

4
tests/run_ec2
View File

@@ -1,5 +1,5 @@
#!/bin/bash #!/bin/bash
KEYNAME="$1" KEYNAME="$1"; BRANCH=${1:-"master"}
indent() { sed "s/^/ /"; } indent() { sed "s/^/ /"; }
echo "-----> Booting EC2 instance..." echo "-----> Booting EC2 instance..."
start=$(ec2-run-instances -k $1 ami-f3d1bb9a 2>&1 ) start=$(ec2-run-instances -k $1 ami-f3d1bb9a 2>&1 )
@@ -33,7 +33,7 @@ while [[ ! $(echo | nc $PUBLIC_IP 22) ]]; do
done done
set -e set -e
echo "-----> Connecting and running boostrap script..." echo "-----> Connecting and running boostrap script..."
cat ../bootstrap.sh | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "HOSTNAME=$PUBLIC_IP sudo bash" 2>&1 | indent cat ../bootstrap.sh | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "HOSTNAME=$PUBLIC_IP DOKKU_BRANCH=$BRANCH sudo bash" 2>&1 | indent
echo "-----> Installing SSH public keys..." echo "-----> Installing SSH public keys..."
cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo gitreceive upload-key test" > /dev/null cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo gitreceive upload-key test" > /dev/null
cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo sshcommand acl-add dokku test" > /dev/null cat ~/.ssh/id_rsa.pub | ssh -o "StrictHostKeyChecking=no" ubuntu@$PUBLIC_IP "sudo sshcommand acl-add dokku test" > /dev/null