diff --git a/ci/docker_images/ubuntu/#Dockerfile# b/ci/docker_images/ubuntu/#Dockerfile#
deleted file mode 100644
index 7b4d9a4374b27ed66e0c86acf40fb3afa2df49cf..0000000000000000000000000000000000000000
--- a/ci/docker_images/ubuntu/#Dockerfile#
+++ /dev/null
@@ -1,58 +0,0 @@
-FROM ubuntu:14.04.2
-MAINTAINER guido.stevens@cosent.net
-# we need ruby>2.0.0 for jekyll>3.0.0
-RUN apt-get update && apt-get install -y software-properties-common && apt-add-repository -y ppa:brightbox/ruby-ng
-RUN apt-get update && apt-get install -y \
- curl \
- firefox \
- gcc \
- gettext \
- ghostscript \
- git-core \
- graphicsmagick \
- jed \
- libenchant-dev \
- libffi-dev \
- libfreetype6-dev \
- libjpeg-dev \
- libreoffice \
- libxslt1-dev \
- make \
- pdftk \
- poppler-data \
- poppler-utils \
- python-dev \
- python-gdbm \
- python-lxml \
- python-pip \
- python-tk \
- python-virtualenv \
- redis-server \
- ruby2.3 \
- ruby2.3-dev \
- wget \
- xvfb \
- zlib1g-dev
- RUN gem install docsplit
- RUN locale-gen en_US.UTF-8 nl_NL@euro
- COPY buildout.d /tmp/buildout.d
- COPY buildout.cfg /tmp/
- COPY requirements.txt /tmp/
- RUN cd /tmp && \
- wget https://launchpad.net/plone/5.0/5.0.4/+download/Plone-5.0.4-UnifiedInstaller.tgz && \
- tar xzf Plone-5.0.4-UnifiedInstaller.tgz && \
- tar xjf Plone-5.0.4-UnifiedInstaller/packages/buildout-cache.tar.bz2 && \
- mv buildout-cache/* /var/tmp/ && \
- mkdir /var/tmp/extends && \
- rm -rf Plone* buildout-cache
- RUN mkdir /tmp/build && cd /tmp/build && \
- cp -r /tmp/buildout.* /tmp/requirements.txt . && \
- virtualenv -p python2.7 . && \
- bin/pip install -r requirements.txt && \
- bin/buildout -c buildout.cfg && \
- chmod -R a+rwX /var/tmp/eggs /var/tmp/downloads /var/tmp/extends && \
- cd /tmp && rm -rf /tmp/build
- CMD ["/bin/bash"]# This is a comment
-FROM ubuntu:14.04
-MAINTAINER Franck Pérignon <Franck.Perignon@imag.fr>
-RUN apt-get update && apt-get install -y cmake
\ No newline at end of file
diff --git a/ci/docker_images/ubuntu/Dockerfile b/ci/docker_images/ubuntu/Dockerfile
index 01fda919a1ba9e71df145647d01f717096241df2..2002ab92ab697f8b3de16b3db67fc0e0cb378041 100644
--- a/ci/docker_images/ubuntu/Dockerfile
+++ b/ci/docker_images/ubuntu/Dockerfile
@@ -4,6 +4,7 @@ MAINTAINER Franck.Perignon@imag.fr
# we need cmake, python ...
RUN apt-get update && apt-get install -y \
cmake\
+ ssh\
python-dev\
libblas-dev\
python\
@@ -19,6 +20,7 @@ RUN apt-get update && apt-get install -y \
openmpi-bin\
libopenmpi-dev\
libhdf5-openmpi-dev\
+ cython\
python-numpy\
python-scipy\
python-pyopencl\
@@ -26,18 +28,23 @@ RUN apt-get update && apt-get install -y \
libfftw3-dev\
libfftw3-mpi-dev\
python-pytest\
- cython
+ wget && \
+ rm -rf /var/lib/apt/lists/*
RUN pip install --upgrade pip
RUN pip install --upgrade setuptools
RUN pip install mpi4py
RUN pip install sphinx
RUN pip install wheel
-RUN wget https://pypi.python.org/packages/22/82/64dada5382a60471f85f16eb7d01cc1a9620aea855cd665609adf6fdbb0d/h5py-2.6.0.tar.gz
-RUN tar -zxvf h5py-2.6.0.tar.gz
-RUN cd h5py-2.6.0
-RUN export CC=mpicc
-RUN python setup.py configure --mpi --hdf5=/usr/
-RUN python setup.py install
+RUN wget https://pypi.python.org/packages/22/82/64dada5382a60471f85f16eb7d01cc1a9620aea855cd665609adf6fdbb0d/h5py-2.6.0.tar.gz && \
+ tar -zxvf h5py-2.6.0.tar.gz && \
+ cd h5py-2.6.0 && \
+ export CC=mpicc && \
+ export CFLAGS="-I/usr/include/hdf5/openmpi/"&& \
+ export LDFLAGS="-L /usr/lib/x86_64-linux-gnu/hdf5/openmpi/"&& \
+ python setup.py configure --mpi --hdf5=/usr/ && \
+ python setup.py install && \
+ cd .. && \
+ rm -rf h5py-2.6.0*
RUN cd ..
CMD ["/bin/bash"]