From 93ba8f98e0154d106a075a7ddc29ece54d99f4fa Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Wed, 29 Apr 2015 21:39:06 +0000 Subject: [PATCH] Fixes on orchestra deployment --- README.md | 5 ++--- scripts/container/deploy.sh | 2 +- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index c8435201..28b08bfc 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,7 @@ If you are planing to do some development or perhaps just checking out this proj 1. Create a basic [LXC](http://linuxcontainers.org/) container, start it and get inside. ```bash wget -O /tmp/create.sh \ - https://raw.github.com/glic3rinu/django-orchestra/master/scripts/container/create.sh + https://raw.github.com/glic3rinu/django-orchestra/master/scripts/container/create.sh sudo bash /tmp/create.sh sudo lxc-start -n orchestra # root/root @@ -49,7 +49,7 @@ If you are planing to do some development or perhaps just checking out this proj # Probably you will have to configure the NAT first: # sudo iptables -t nat -A POSTROUTING -s `container_ip` -j MASQUERADE wget -O /tmp/deploy.sh \ - https://raw.github.com/glic3rinu/django-orchestra/master/scripts/container/deploy.sh + https://raw.github.com/glic3rinu/django-orchestra/master/scripts/container/deploy.sh cd /tmp/ # Moving away from /root before running deploy.sh bash /tmp/deploy.sh ``` @@ -73,7 +73,6 @@ If you are planing to do some development or perhaps just checking out this proj 5. To upgrade to current master just ```bash cd ~orchestra/django-orchestra/ - git pull origin master sudo ~orchestra/django-orchestra/scripts/container/deploy.sh ``` diff --git a/scripts/container/deploy.sh b/scripts/container/deploy.sh index 2a950906..6aa94d16 100755 --- a/scripts/container/deploy.sh +++ b/scripts/container/deploy.sh @@ -54,7 +54,7 @@ if [[ ! $CURRENT_VERSION ]]; then run "cp $HOME/django-orchestra/orchestra/bin/orchestra-admin /usr/local/bin/" else # Upgrade and relay on postguprade for finishing up the installation - export GIT_DIR=~/django-orchestra/.git; git pull + surun "export GIT_DIR=~/django-orchestra/.git && git checkout master && git pull origin" $PYTHON_BIN $MANAGE migrate postupgradeorchestra --from $CURRENT_VERSION exit fi