From 540dc1e3d4c8537e8b91a42bc97e9aa06e500aec Mon Sep 17 00:00:00 2001 From: "Aflitos, Saulo Alves" <sauloalves.aflitos@wur.nl> Date: Tue, 20 Oct 2015 18:14:01 +0200 Subject: [PATCH] move python out of runtime --- docker/introgressionbrowser/Dockerfile | 2 ++ docker/introgressionbrowser_runtime/Dockerfile | 10 ++++------ .../requirements.txt | 18 ------------------ 3 files changed, 6 insertions(+), 24 deletions(-) delete mode 100644 docker/introgressionbrowser_runtime/requirements.txt diff --git a/docker/introgressionbrowser/Dockerfile b/docker/introgressionbrowser/Dockerfile index c7731ef..4feb356 100644 --- a/docker/introgressionbrowser/Dockerfile +++ b/docker/introgressionbrowser/Dockerfile @@ -10,6 +10,8 @@ FROM sauloal/introgressionbrowser_runtime RUN cd /var/www && git clone https://github.com/sauloal/introgressionbrowser.git ibrowser && ls ibrowser +RUN cd /var/www/ibrowser && pip install --requirement requirements.txt + VOLUME /var/www/ibrowser/data #VOLUME /var/log/apache2/access.log #VOLUME /var/log/apache2/error.log diff --git a/docker/introgressionbrowser_runtime/Dockerfile b/docker/introgressionbrowser_runtime/Dockerfile index 92f6992..288bd48 100644 --- a/docker/introgressionbrowser_runtime/Dockerfile +++ b/docker/introgressionbrowser_runtime/Dockerfile @@ -35,8 +35,8 @@ deb http://'$AMAZON'.clouds.archive.ubuntu.com/ubuntu/ trusty-security main rest cat /etc/apt/sources.list && \ printenv | sort && \ rm /var/lib/apt/lists/* -rvf && \ - mkdir -p /var/lib/apt/lists/partial && \ - chmod 755 /var/lib/apt/lists/partial && \ + rm -f /var/cache/apt/* -rfv && \ + echo "Acquire::http {No-Cache=True;};" > /etc/apt/apt.conf.d/no-cache && \ apt-get update && \ apt-get -y upgrade && \ apt-get install -y -f libapache2-mod-wsgi apache2 nano build-essential \ @@ -51,8 +51,6 @@ deb http://'$AMAZON'.clouds.archive.ubuntu.com/ubuntu/ trusty-security main rest mkdir -p /etc/apache2/mods-available/ # apt-get clean all && \ - -ADD requirements.txt /requirements.txt - -RUN pip install --requirement /requirements.txt +# mkdir -p /var/lib/apt/lists/partial && \ +# chmod 755 /var/lib/apt/lists/partial && \ diff --git a/docker/introgressionbrowser_runtime/requirements.txt b/docker/introgressionbrowser_runtime/requirements.txt deleted file mode 100644 index abdd75c..0000000 --- a/docker/introgressionbrowser_runtime/requirements.txt +++ /dev/null @@ -1,18 +0,0 @@ -flask -ete2 -sqlalchemy -Flask-SQLAlchemy -pysha3 -pycrypto -pyinotify - -##preferably install system wide -#apt-get install -y python-setuptools python-dev python-numpy python-scipy python-matplotlib python-pandas python-sympy python-pip python-imaging -# -##if not, uncomment the following lines -#Pillow -#Image -#numpy -#scipy -#matplotlib -#MySQL-python -- GitLab