From 93974ef989dea5d5749ecd9e01e742c0ffadeb35 Mon Sep 17 00:00:00 2001 From: Marc Aymerich Date: Sat, 3 Oct 2015 10:37:43 +0000 Subject: [PATCH] Fixes on deployment --- README.md | 8 ++------ orchestra/bin/orchestra-admin | 24 +++++++++++++----------- requirements.txt | 2 +- scripts/containers/Dockerfile | 21 ++------------------- scripts/containers/deploy.sh | 2 +- 5 files changed, 19 insertions(+), 38 deletions(-) diff --git a/README.md b/README.md index aa4df85c..d3633506 100644 --- a/README.md +++ b/README.md @@ -44,17 +44,13 @@ pip3 install django-orchestra==dev \ --allow-unverified django-orchestra # The only non-pip required dependency for runing pip install is python3-dev # sudo apt-get install python3.4-dev -pip3 install -r \ - https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/requirements.txt +pip3 install -r http://git.io/orchestra-requirements.txt # Create a new Orchestra site orchestra-admin startproject panel python3 panel/manage.py migrate python3 panel/manage.py runserver - -# Enable periodic tasks with cron (optional) -python3 panel/manage.py setupcronbeat -python3 panel/manage.py syncperiodictasks +# Browse to http://127.0.0.1:8000/admin/ ``` Now you can see the web interface on http://localhost:8000/admin diff --git a/orchestra/bin/orchestra-admin b/orchestra/bin/orchestra-admin index f899581f..da9196fe 100755 --- a/orchestra/bin/orchestra-admin +++ b/orchestra/bin/orchestra-admin @@ -39,7 +39,6 @@ function print_help () { EOF } -# in show () { @@ -111,25 +110,28 @@ function install_requirements () { ORCHESTRA_PATH=$(get_orchestra_dir) || true # lxml: libxml2-dev, libxslt1-dev, zlib1g-dev - APT="python3 \ - python3-pip \ - python3-dev \ - libxml2-dev \ - libxslt1-dev \ - zlib1g-dev \ - bind9utils \ - xvfb \ + APT="bind9utils \ ca-certificates \ gettext \ - libcrack2-dev" + libcrack2-dev \ + libxml2-dev \ + libxslt1-dev \ + python3 \ + python3-pip \ + python3-dev \ + ssh-client \ + wget \ + xvfb \ + zlib1g-dev" # cracklib and lxml are excluded on the requirements.txt because they need unconvinient system dependencies - PIP="$(curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/requirements.txt | tr '\n' ' ') \ + PIP="$(wget http://git.io/orchestra-requirements.txt -O - | tr '\n' ' ') \ cracklib \ lxml==3.3.5" if $testing; then APT="${APT} \ + git \ iceweasel \ dnsutils" diff --git a/requirements.txt b/requirements.txt index e159518a..c924d30c 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,6 +1,6 @@ django==1.8.2 django-celery-email==1.0.4 -django-fluent-dashboard==0.5 +django-fluent-dashboard==0.5.3 django-admin-tools==0.6.0 django-extensions==1.5.2 django-transaction-signals==1.0.0 diff --git a/scripts/containers/Dockerfile b/scripts/containers/Dockerfile index 39b0fef0..ce2d2cd7 100644 --- a/scripts/containers/Dockerfile +++ b/scripts/containers/Dockerfile @@ -1,25 +1,8 @@ FROM debian:latest -RUN apt-get -y update && apt-get install -y \ - git \ - screen \ - sudo \ - python3 \ - python3-pip \ - wget \ - curl \ - net-tools \ - dnsutils \ - rsyslog \ - nano \ - ssh-client \ - python3-psycopg2 \ - postgresql \ - nginx-full \ - uwsgi \ - uwsgi-plugin-python3 +RUN apt-get -y update && apt-get install -y curl sudo -RUN export TERM=xterm; curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/orchestra/bin/orchestra-admin | bash -s install_requirements +RUN export TERM=xterm; curl http://git.io/orchestra-admin | bash -s install_requirements RUN apt-get clean diff --git a/scripts/containers/deploy.sh b/scripts/containers/deploy.sh index 8e8f35ef..b729763f 100644 --- a/scripts/containers/deploy.sh +++ b/scripts/containers/deploy.sh @@ -2,7 +2,7 @@ set -ue - +# https://git.io/deploy-orchestra # bash <( curl https://raw.githubusercontent.com/glic3rinu/django-orchestra/master/scripts/containers/deploy.sh ) [--noinput username]