Skip to content

C
clinicaltrials
Commit 434ff23d authored by Romain Loth's avatar Romain Loth
Browse files
Options

Merge branch 'with_tina_1.2' of https://github.com/moma/comex2 into with_tina_1.2

parents 21064f3b ae65c60f
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 2 deletions
setup/dockers/comex2_services/Dockerfile
View file @ 434ff23d
...@@ -36,16 +36,16 @@ RUN ln -s ../sites-available/comex2_php_and_services.nginx.conf ...@@ -36,16 +36,16 @@ RUN ln -s ../sites-available/comex2_php_and_services.nginx.conf
WORKDIR / WORKDIR /
# pull the comex server from repository... # pull the comex server from repository...
RUN echo "updating"
RUN git clone https://github.com/moma/comex2.git RUN git clone https://github.com/moma/comex2.git
# activate the tina 2 variant # activate the tina 2 variant
WORKDIR /comex2
RUN git checkout with_tina_1.2 RUN git checkout with_tina_1.2
# ...or copy it locally # ...or copy it locally
# ADD comex2 /comex2 # ADD comex2 /comex2
# main CMD to start the app
WORKDIR /comex2
# start nginx inner wrapper and gunicorn production server # start nginx inner wrapper and gunicorn production server
CMD bash comex-run.sh -p CMD bash comex-run.sh -p
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment