From c57c17a5bedf2dba12c5d0aad6d2f65064b2b9ca Mon Sep 17 00:00:00 2001
From: Matthieu Boileau <matthieu.boileau@math.unistra.fr>
Date: Wed, 29 Nov 2017 21:44:34 +0100
Subject: [PATCH] docker/ from master
---
docker/Dockerfile-pythran | 14 ++++++++++----
docker/Dockerfile-rosen | 1 +
docker/docker-compose.yml | 1 +
3 files changed, 12 insertions(+), 4 deletions(-)
diff --git a/docker/Dockerfile-pythran b/docker/Dockerfile-pythran
index 136d8bd..aa69995 100644
--- a/docker/Dockerfile-pythran
+++ b/docker/Dockerfile-pythran
@@ -1,21 +1,27 @@
FROM python:3
MAINTAINER Matthieu Boileau <matthieu.boileau@math.unistra.fr>
-COPY requirements.txt ./
-RUN pip install --no-cache-dir -r requirements.txt
-
RUN apt-get update --fix-missing && \
apt-get install -y \
+ python-dev \
vim
RUN apt-get clean && \
rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/*
+RUN pip install --no-cache-dir virtualenv
+RUN pip install --no-cache-dir --upgrade pip
+COPY requirements.txt ./
+RUN pip install --no-cache-dir -r requirements.txt
+
RUN useradd -m -s /bin/bash euler
ENV HOME /home/euler
RUN chown -R euler:euler /home/euler
USER euler
WORKDIR $HOME
-CMD /bin/bash
+RUN virtualenv --python=/usr/bin/python2.7 $HOME/py27
+COPY requirements.txt /tmp/
+RUN $HOME/py27/bin/pip install --no-cache-dir -r /tmp/requirements.txt
+CMD /bin/bash
diff --git a/docker/Dockerfile-rosen b/docker/Dockerfile-rosen
index 27c7e60..160abec 100644
--- a/docker/Dockerfile-rosen
+++ b/docker/Dockerfile-rosen
@@ -1,4 +1,5 @@
FROM boileaum/pythran:latest
+MAINTAINER Matthieu Boileau <matthieu.boileau@math.unistra.fr>
ENV HOME /home/euler
ADD . $HOME/rosen
diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml
index 21e8d04..fd50ef6 100644
--- a/docker/docker-compose.yml
+++ b/docker/docker-compose.yml
@@ -1,6 +1,7 @@
version: '2'
services:
+
env:
build:
context: ../
--
GitLab