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

clean code for work in master

This commit is contained in:
Cayo Puigdefabregas 2021-01-29 14:11:54 +01:00
parent 2619a50410
commit 6450d0d749
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
INSTALLDEV.md
View File

@ -11,7 +11,7 @@ If you are planing to do some development you may want to consider doing it unde
2. Build a new image, create and start a container
```bash
curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/docker/scripts/containers/Dockerfile > /tmp/Dockerfile
curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/master/scripts/containers/Dockerfile > /tmp/Dockerfile
docker build -t orchestra /tmp/
docker create --name orchestra -i -t -u orchestra -w /home/orchestra orchestra bash
docker start orchestra
@ -21,12 +21,13 @@ If you are planing to do some development you may want to consider doing it unde
3. Deploy django-orchestra development environment, inside the container
```bash
bash <( curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/docker/scripts/containers/orchestra-deploy ) --dev
bash <( curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/master/scripts/containers/orchestra-deploy ) --dev
```
3. Nginx should be serving on port 80, but Django's development server can be used as well:
```bash
cd panel
python3 manage.py migrate
python3 manage.py runserver 0.0.0.0:8888
```
@ -34,5 +35,5 @@ If you are planing to do some development you may want to consider doing it unde
5. To upgrade to current master just re-run the deploy script
```bash
git pull origin master
bash <( curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/docker/scripts/containers/orchestra-deploy ) --dev
bash <( curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/master/scripts/containers/orchestra-deploy ) --dev
```

2
scripts/containers/Dockerfile
View File

@ -132,7 +132,7 @@ RUN set -ex; \
RUN apt-get -y update && apt-get install -y curl sudo
RUN export TERM=xterm; curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/docker/orchestra/bin/orchestra-admin | bash -s install_requirements
RUN export TERM=xterm; curl -L https://raw.githubusercontent.com/ribaguifi/django-orchestra/master/orchestra/bin/orchestra-admin | bash -s install_requirements
RUN apt-get clean

2
scripts/containers/orchestra-deploy
View File

@ -62,8 +62,6 @@ function install_orchestra () {
# Finishing partial installation
surun "export GIT_DIR=$home/django-orchestra/.git; git pull"
}
# TODO remove this line when it branch is merged to master
surun "cd $home/django-orchestra/; git checkout docker"
echo $home/django-orchestra/ | sudo tee "$python_path/orchestra.pth"
else
echo "You may want to execute 'git pull origin master'?"