From 75a5466650f9d8da01a91faac9be6fbdc58d4ead Mon Sep 17 00:00:00 2001 From: Jeff Lindsay Date: Fri, 8 Nov 2013 14:19:30 -0800 Subject: [PATCH] boot is now an image setup script. receiver updated to work with gitreceive-next --- tests/ci/receiver | 4 ++-- tests/ci/{boot.sh => setup.sh} | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) rename tests/ci/{boot.sh => setup.sh} (95%) diff --git a/tests/ci/receiver b/tests/ci/receiver index 57c006e59..26b4a1986 100755 --- a/tests/ci/receiver +++ b/tests/ci/receiver @@ -1,7 +1,7 @@ #!/usr/bin/env bash set -eo pipefail -if [[ $3 == *dokku* ]]; then +if [[ $2 == *dokku* ]]; then mkdir $HOME/build cd $HOME/build tar -xf - @@ -12,7 +12,7 @@ if [[ $3 == *dokku* ]]; then echo "-----> Generating keypair..." ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N '' echo "-----> Installing SSH public key..." - cat ~/.ssh/id_rsa.pub | sudo sshcommand acl-add dokku test + cat $HOME/.ssh/id_rsa.pub | sudo sshcommand acl-add dokku test echo "-----> Intitial SSH connection to populate known_hosts..." ssh -o StrictHostKeyChecking=no dokku@dokku.me help echo "-----> Running tests" diff --git a/tests/ci/boot.sh b/tests/ci/setup.sh similarity index 95% rename from tests/ci/boot.sh rename to tests/ci/setup.sh index 411056b4c..d020280af 100755 --- a/tests/ci/boot.sh +++ b/tests/ci/setup.sh @@ -14,9 +14,6 @@ export GOPATH=/root/go git clone https://github.com/flynn/gitreceive-next.git cd gitreceive-next && make install -curl https://raw.github.com/progrium/dokku/master/tests/ci/receiver -s > /tmp/receiver -chmod +x /tmp/receiver - ssh-keygen -f $HOME/.ssh/id_rsa -t rsa -N '' cat< /etc/init/gitreceived.conf @@ -24,4 +21,7 @@ start on runlevel [2345] exec /usr/local/bin/gitreceived -p 2022 -n /root/.ssh/id_rsa /tmp/receiver EOF -start gitreceived \ No newline at end of file +cat< /etc/rc.local +curl https://raw.github.com/progrium/dokku/master/tests/ci/receiver -s > /tmp/receiver +chmod +x /tmp/receiver +EOF \ No newline at end of file