Skip to content
Permalink
Browse files

vidjil-server/Dockerfile: refer to server/Makefile to download web2py

Prevents duplicating code and allows to use same web2py version.
Closes #3605.
by @mikael-s and @magiraud
  • Loading branch information...
Vidjil Team authored and magiraud committed Feb 28, 2019
1 parent eb9c7d1 commit b579cd5277609f763a14c8435d043c692831b31a
Showing with 4 additions and 2 deletions.
  1. +1 −1 docker/vidjil-server/Dockerfile
  2. +3 −1 server/Makefile
@@ -20,7 +20,7 @@ run apt-get update ; apt-get install --no-install-recommends --no-install-sugges
arg git_branch=dev
arg remote_repo=https://gitlab.inria.fr/vidjil/vidjil.git
run cd /usr/share/ && git config --global http.sslVerify false && git clone -b $git_branch $remote_repo
run cd /usr/share/vidjil/server && wget --no-check-certificate https://mdipierro.pythonanywhere.com/examples/static/web2py_src.zip && unzip web2py_src.zip && unlink web2py_src.zip
run cd /usr/share/vidjil/server && make download_web2py && unzip web2py_src.zip && unlink web2py_src.zip

add ./scripts/install.sh /opt/install_scripts/install.sh
copy ./conf/defs.py /opt/vidjil_conf/defs.py
@@ -3,8 +3,10 @@ WEB2PY_VERSION=2.17.2

install: install_web2py

install_web2py:
download_web2py:
wget http://web2py.com/examples/static/${WEB2PY_VERSION}/web2py_src.zip

install_web2py: download_web2py
unzip web2py_src.zip
mv web2py/handlers/wsgihandler.py web2py/wsgihandler.py
rm web2py_src.zip

0 comments on commit b579cd5

Please sign in to comment.
You can’t perform that action at this time.