Fix vagrant test setup
This commit is contained in:
@@ -1,7 +1,8 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
SELF=`which $0`
|
SELF=`which $0`
|
||||||
VAGRANT_SSH_PORT=${$VAGRANT_SSH_PORT:-"2222"}
|
VAGRANT_SSH_PORT=${VAGRANT_SSH_PORT:-"2222"}
|
||||||
PUBLIC_KEY=${PUBLIC_KEY:-"~/.ssh/id_rsa.pub"}
|
PUBLIC_KEY=${PUBLIC_KEY:-"$HOME/.ssh/id_rsa.pub"}
|
||||||
|
FORWARDED_PORT=${FORWARDED_PORT:-":8080"}
|
||||||
indent() { sed "s/^/ /"; }
|
indent() { sed "s/^/ /"; }
|
||||||
if [[ ! $(cat ~/.ssh/config 2>/dev/null | grep dokku.me) ]]; then
|
if [[ ! $(cat ~/.ssh/config 2>/dev/null | grep dokku.me) ]]; then
|
||||||
echo "-----> Configuring SSH to use $VAGRANT_SSH_PORT for dokku.me..."
|
echo "-----> Configuring SSH to use $VAGRANT_SSH_PORT for dokku.me..."
|
||||||
@@ -11,4 +12,14 @@ if [[ ! $(cat ~/.ssh/config 2>/dev/null | grep dokku.me) ]]; then
|
|||||||
fi
|
fi
|
||||||
echo "-----> Ensuring Vagrant is running..."
|
echo "-----> Ensuring Vagrant is running..."
|
||||||
cd "$(dirname $SELF)/.." && vagrant up | indent
|
cd "$(dirname $SELF)/.." && vagrant up | indent
|
||||||
|
cd "$(dirname $SELF)"
|
||||||
|
|
||||||
|
echo "-----> Installing SSH public keys..."
|
||||||
cat $PUBLIC_KEY | ssh -o "StrictHostKeyChecking=no" -i ~/.vagrant.d/insecure_private_key vagrant@dokku.me "sudo gitreceive upload-key test"
|
cat $PUBLIC_KEY | ssh -o "StrictHostKeyChecking=no" -i ~/.vagrant.d/insecure_private_key vagrant@dokku.me "sudo gitreceive upload-key test"
|
||||||
|
cat $PUBLIC_KEY | ssh -o "StrictHostKeyChecking=no" -i ~/.vagrant.d/insecure_private_key vagrant@dokku.me "sudo sshcommand acl-add dokku test"
|
||||||
|
|
||||||
|
for app_path in apps/*; do
|
||||||
|
app=$(basename $app_path)
|
||||||
|
echo "-----> Running test deploy of $app..."
|
||||||
|
./test_deploy $app_path dokku.me $FORWARDED_PORT
|
||||||
|
done
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
#!/bin/bash
|
#!/bin/bash
|
||||||
set -e
|
set -e
|
||||||
SELF=`which $0`; APP="$1"; TARGET="$2"
|
SELF=`which $0`; APP="$1"; TARGET="$2"; FORWARDED_PORT="$3"
|
||||||
TMP=$(mktemp -d -t "$TARGET.XXXXX")
|
TMP=$(mktemp -d -t "$TARGET.XXXXX")
|
||||||
trap "rm -rf $TMP" EXIT
|
trap "rm -rf $TMP" EXIT
|
||||||
rmdir $TMP && cp -r $(dirname $SELF)/$APP $TMP
|
rmdir $TMP && cp -r $(dirname $SELF)/$APP $TMP
|
||||||
@@ -13,7 +13,7 @@ git commit -m 'initial commit'
|
|||||||
REPO="test-$(basename $APP)-$RANDOM"
|
REPO="test-$(basename $APP)-$RANDOM"
|
||||||
git remote add target git@$TARGET:$REPO
|
git remote add target git@$TARGET:$REPO
|
||||||
git push target master
|
git push target master
|
||||||
URL=$(ssh dokku@$TARGET url $REPO)
|
URL=$(ssh dokku@$TARGET url $REPO)$FORWARDED_PORT
|
||||||
sleep 2
|
sleep 2
|
||||||
./check_deploy $URL && echo "-----> Deploy success!" || {
|
./check_deploy $URL && echo "-----> Deploy success!" || {
|
||||||
sleep 4
|
sleep 4
|
||||||
|
|||||||
Reference in New Issue
Block a user