Reorder Dockerfile

diff --git a/Dockerfile b/Dockerfile
index 559e12493c28c215b731884cd9504b6d56d9739c..0c05dca4abf291b4e37434d55713788cf7814b0b 100644 (file)
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,12 +20,6 @@ ENV LANG fr_FR.UTF-8
 ENV LANGUAGE fr_FR:fr
 ENV LC_ALL fr_FR.UTF-8
 
-COPY requirements.txt /srv
-RUN pip install -r requirements.txt
-
-COPY requirements-dev.txt /srv
-RUN pip install -r requirements-dev.txt --src /srv/lib
-
 COPY package.json /srv
 RUN npm install
 
@@ -41,4 +35,10 @@ COPY gulpfile.js /srv
 RUN npm install -g gulp
 RUN gulp build
 
+COPY requirements.txt /srv
+RUN pip install -r requirements.txt
+
+COPY requirements-dev.txt /srv
+RUN pip install -r requirements-dev.txt --src /srv/lib
+
 WORKDIR /srv/app

diff --git a/bin/build_doc.sh b/bin/build_doc.sh
new file mode 100755 (executable)
index 0000000..abc248d
--- /dev/null
+++ b/bin/build_doc.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose run app bash /srv/doc/build.sh

diff --git a/bin/build_front.sh b/bin/build_front.sh
new file mode 100755 (executable)
index 0000000..26da357
--- /dev/null
+++ b/bin/build_front.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose run app bash -c "cd /srv && bower install && gulp build"

diff --git a/bin/build_graph.sh b/bin/build_graph.sh
new file mode 100755 (executable)
index 0000000..b5cda09
--- /dev/null
+++ b/bin/build_graph.sh
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+docker-compose run app python /srv/app/manage.py graph_models organization-core organization-media organization-pages organization.network organization.magazine organization.projects organization.agenda organization.shop organization.job > /srv/doc/graph/mezzanine-organization.dot

diff --git a/bin/front_build.sh b/bin/front_build.sh
deleted file mode 100644 (file)
index 26da357..0000000
--- a/bin/front_build.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-docker-compose run app bash -c "cd /srv && bower install && gulp build"

diff --git a/bin/graph_model.sh b/bin/graph_model.sh
deleted file mode 100755 (executable)
index b5cda09..0000000
--- a/bin/graph_model.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-docker-compose run app python /srv/app/manage.py graph_models organization-core organization-media organization-pages organization.network organization.magazine organization.projects organization.agenda organization.shop organization.job > /srv/doc/graph/mezzanine-organization.dot

diff --git a/doc/build.sh b/doc/build.sh
index 968fc08ab1e78c0b368925170b26859cfa04aa12..6b920542138fc6a1e700ba7201ee57fb21fad808 100755 (executable)
--- a/doc/build.sh
+++ b/doc/build.sh
@@ -1,7 +1,5 @@
 #!/bin/sh
 
 cd /srv/doc
-make install_deps
 make html
-make publish
 make readme

diff --git a/requirements.txt b/requirements.txt
index 7da3ebddfed287fa83a316cecbf67be5e0e2130d..9f59f84eb2e725a7f20858146d7d2d2de216607d 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -20,3 +20,4 @@ xlrd==1.0.0
 ipython
 gitpython
 pygraphviz
+sphinx_rtd_theme