From 6450d0d7494893a61d998e186af2d3a95dc83cf6 Mon Sep 17 00:00:00 2001 From: Cayo Puigdefabregas Date: Fri, 29 Jan 2021 14:11:54 +0100 Subject: [PATCH] clean code for work in master --- INSTALLDEV.md | 7 ++++--- scripts/containers/Dockerfile | 2 +- scripts/containers/orchestra-deploy | 2 -- 3 files changed, 5 insertions(+), 6 deletions(-) diff --git a/INSTALLDEV.md b/INSTALLDEV.md index 96420d12..3b9f78ac 100644 --- a/INSTALLDEV.md +++ b/INSTALLDEV.md @@ -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 ``` diff --git a/scripts/containers/Dockerfile b/scripts/containers/Dockerfile index 35c92639..d06a0af1 100644 --- a/scripts/containers/Dockerfile +++ b/scripts/containers/Dockerfile @@ -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 diff --git a/scripts/containers/orchestra-deploy b/scripts/containers/orchestra-deploy index 58c6dadd..c5203e1a 100644 --- a/scripts/containers/orchestra-deploy +++ b/scripts/containers/orchestra-deploy @@ -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'?"