Rewrote the files by hand and changed the inheritance structure

This commit is contained in:
Jorrit Wronski
2015-10-11 23:12:06 +02:00
parent 59e3624a52
commit 85c19e4c13
3 changed files with 56 additions and 41 deletions

View File

@@ -4,6 +4,10 @@ FROM debian:stable
# File Author / Maintainer
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
# Just to make sure
USER root
WORKDIR /
# Install system tools for compilation
RUN apt-get update -qq && \
apt-get install -y build-essential gfortran gcc cmake git && \

View File

@@ -1,33 +1,32 @@
# 2015-10-11 16:07 CAUTION: This file is automatically generated from Dockerfile.slave.python.tpl, do not edit it manually.
# Set the base image to Debian
# Set the base image
FROM coolprop/slavebase
# File Author / Maintainer
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
#
#
# Just to make sure
USER root
WORKDIR /
# Install system tools for compilation of Python extensions numpy, scipy and pandas
RUN apt-get update -qq && \
apt-get install -y build-essential gcc python-dev \
libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev && \
apt-get clean
# Run as user
USER buildbot
WORKDIR /home/buildbot
#
# Install miniconda Python distribution
RUN curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
chmod +x miniconda.sh && ./miniconda.sh -b && rm miniconda.sh && \
echo "export PATH=/home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH" >> /home/buildbot/.bash_profile
#
env PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH
#
# Add the miniconda environments for the Python builds
RUN \
conda create -n CoolProp27 python=2.7 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas && \
conda create -n CoolProp33 python=3.3 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas && \
conda create -n CoolProp34 python=3.4 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas && \
conda create -n CoolProp27 python=2.7 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
conda create -n CoolProp33 python=3.3 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
conda create -n CoolProp34 python=3.4 cython pip jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && \
conda clean -yilts
#
#RUN \
#source activate CoolProp27 && \
#pip install wheel && \
#source deactivate && \
#source activate CoolProp33 && \
#pip install wheel && \
#source deactivate && \
#source activate CoolProp34 && \
#pip install wheel && \
#source deactivate && \
#conda clean -yilts

View File

@@ -1,27 +1,39 @@
# 2015-10-11 16:07 CAUTION: This file is automatically generated from Dockerfile.slave.web.tpl, do not edit it manually.
# Set the base image to Debian
FROM coolprop/slavepython
# Set the base image
FROM coolprop/slavebase
# File Author / Maintainer
MAINTAINER Jorrit Wronski (jowr@ipu.dk)
#
# Just to make sure
USER root
WORKDIR /
# Install system tools for compilation of Python extensions numpy, scipy and pandas
RUN apt-get update -qq && \
apt-get install -y build-essential git gcc gfortran cmake python-dev libxml2-dev libxslt1-dev libxslt1.1 doxygen libtool libatlas3-base libblas3 liblapack3 libatlas-dev libblas-dev liblapack-dev python-dev libpng-dev tk libfreetype6-dev && \
apt-get install -y build-essential git gcc gfortran cmake python-dev \
libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev \
libxml2-dev libxslt1-dev libxslt1.1 doxygen libtool \
libatlas3-base libblas3 liblapack3 libatlas-dev libblas-dev liblapack-dev \
libpng-dev tk libfreetype6-dev && \
apt-get clean
#
# Run as user
USER buildbot
WORKDIR /home/buildbot
# Install miniconda Python distribution
RUN curl -o miniconda.sh http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86_64.sh && \
chmod +x miniconda.sh && ./miniconda.sh -b && rm miniconda.sh && \
echo "export PATH=/home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH" >> /home/buildbot/.bash_profile
env PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda/bin:$PATH
# Add the additional packages to the conda environment
RUN \
conda install -n CoolProp27 python=2.7 setuptools cython numpy scipy matplotlib pandas ipython wxpython && \
conda install -n CoolProp33 python=3.3 setuptools cython numpy scipy matplotlib pandas ipython wxpython && \
conda install -n CoolProp34 python=3.4 setuptools cython numpy scipy matplotlib pandas ipython wxpython && \
conda create -n CoolPropWeb python=2.7 setuptools cython numpy scipy matplotlib pandas ipython wxpython && \
conda clean -yilts
#
# Add some pip packages that only exist there
RUN \
source activate CoolProp27 && \
source activate CoolPropWeb && \
pip install sphinx cloud-sptheme sphinxcontrib-bibtex sphinxcontrib-doxylink sphinxcontrib-napoleon && \
source deactivate && \
source activate CoolProp33 && \
pip install sphinx cloud-sptheme sphinxcontrib-bibtex sphinxcontrib-doxylink sphinxcontrib-napoleon && \
source deactivate && \
source activate CoolProp34 && \
pip install sphinx cloud-sptheme sphinxcontrib-bibtex sphinxcontrib-doxylink sphinxcontrib-napoleon && \
source deactivate && \
conda clean -yilts
source deactivate