pedro/django-orchestra-test
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fixes on orchestra deployment

Browse source
This commit is contained in:
Marc Aymerich 2015-04-29 21:39:06 +00:00
parent 2c6bd0469b
commit 93ba8f98e0
2 changed files with 3 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
README.md
View file

@ -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. 1. Create a basic [LXC](http://linuxcontainers.org/) container, start it and get inside.
```bash ```bash
wget -O /tmp/create.sh \ 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 bash /tmp/create.sh
sudo lxc-start -n orchestra sudo lxc-start -n orchestra
# root/root # 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: # Probably you will have to configure the NAT first:
# sudo iptables -t nat -A POSTROUTING -s `container_ip` -j MASQUERADE # sudo iptables -t nat -A POSTROUTING -s `container_ip` -j MASQUERADE
wget -O /tmp/deploy.sh \ 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 cd /tmp/ # Moving away from /root before running deploy.sh
bash /tmp/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 5. To upgrade to current master just
```bash ```bash
cd ~orchestra/django-orchestra/ cd ~orchestra/django-orchestra/
git pull origin master
sudo ~orchestra/django-orchestra/scripts/container/deploy.sh sudo ~orchestra/django-orchestra/scripts/container/deploy.sh
``` ```

2
scripts/container/deploy.sh
View file

@ -54,7 +54,7 @@ if [[ ! $CURRENT_VERSION ]]; then
run "cp $HOME/django-orchestra/orchestra/bin/orchestra-admin /usr/local/bin/" run "cp $HOME/django-orchestra/orchestra/bin/orchestra-admin /usr/local/bin/"
else else
# Upgrade and relay on postguprade for finishing up the installation # 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 $PYTHON_BIN $MANAGE migrate postupgradeorchestra --from $CURRENT_VERSION
exit exit
fi fi