From 1f0e7232bdaf62a2e6ff580ef79d8c67e67aeab4 Mon Sep 17 00:00:00 2001 From: Guillaume Pellerin Date: Mon, 5 Dec 2016 15:26:04 +0100 Subject: [PATCH] Reorder Dockerfile --- Dockerfile | 12 ++++++------ bin/build_doc.sh | 3 +++ bin/{front_build.sh => build_front.sh} | 0 bin/{graph_model.sh => build_graph.sh} | 0 doc/build.sh | 2 -- requirements.txt | 1 + 6 files changed, 10 insertions(+), 8 deletions(-) create mode 100755 bin/build_doc.sh rename bin/{front_build.sh => build_front.sh} (100%) mode change 100644 => 100755 rename bin/{graph_model.sh => build_graph.sh} (100%) diff --git a/Dockerfile b/Dockerfile index 559e1249..0c05dca4 100644 --- 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 index 00000000..abc248de --- /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/front_build.sh b/bin/build_front.sh old mode 100644 new mode 100755 similarity index 100% rename from bin/front_build.sh rename to bin/build_front.sh diff --git a/bin/graph_model.sh b/bin/build_graph.sh similarity index 100% rename from bin/graph_model.sh rename to bin/build_graph.sh diff --git a/doc/build.sh b/doc/build.sh index 968fc08a..6b920542 100755 --- 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 7da3ebdd..9f59f84e 100644 --- a/requirements.txt +++ b/requirements.txt @@ -20,3 +20,4 @@ xlrd==1.0.0 ipython gitpython pygraphviz +sphinx_rtd_theme -- 2.39.5