diff --git a/slavepython/32bit/Dockerfile b/slavepython/32bit/Dockerfile index 8396113..ff328d9 100644 --- a/slavepython/32bit/Dockerfile +++ b/slavepython/32bit/Dockerfile @@ -1,13 +1,13 @@ -# Do not edit this file manually, it was generated on 2015-11-07 at 20:42 from slavepython/Dockerfile.in +# Do not edit this file manually, it was generated on 2016-03-31 at 11:08 from slavepython/Dockerfile.in # Define an image for CoolProp Python buildslaves -FROM coolprop/slavebase32:latest +FROM coolprop/slavebase32:v1.3 # File Author / Maintainer MAINTAINER Jorrit Wronski # Make sure the follwoing commands are run as root user USER root WORKDIR /root # Install system tools for compilation of Python extensions numpy-scipy-pandas -RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y \ +RUN apt-key update -qq && apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y \ build-essential gcc python-dev libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev && \ DEBIAN_FRONTEND="noninteractive" apt-get autoclean && DEBIAN_FRONTEND="noninteractive" apt-get clean && DEBIAN_FRONTEND="noninteractive" apt-get autoremove # Make sure the following commands are run as the buildbot user @@ -17,4 +17,4 @@ WORKDIR /home/buildbot RUN curl -o miniconda.sh "http://repo.continuum.io/miniconda/Miniconda-latest-Linux-x86.sh" && chmod +x miniconda.sh && linux32 ./miniconda.sh -b && rm miniconda.sh && echo "export PATH=/home/buildbot/miniconda3/bin:/home/buildbot/miniconda2/bin:$PATH" >> /home/buildbot/.bash_profile ENV PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda2/bin:$PATH # Add the miniconda environments for the Python builds -RUN linux32 conda install conda-build && linux32 conda create -n CoolProp27 python=2.7 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda create -n CoolProp33 python=3.3 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda create -n CoolProp34 python=3.4 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda clean -yilts +RUN linux32 conda install conda-build && linux32 conda create -n CoolProp27 python=2.7 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda create -n CoolProp33 python=3.3 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda create -n CoolProp34 python=3.4 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda create -n CoolProp35 python=3.5 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && linux32 conda clean -yilts diff --git a/slavepython/64bit/Dockerfile b/slavepython/64bit/Dockerfile index b5af1e1..a15c180 100644 --- a/slavepython/64bit/Dockerfile +++ b/slavepython/64bit/Dockerfile @@ -1,13 +1,13 @@ -# Do not edit this file manually, it was generated on 2015-11-07 at 20:42 from slavepython/Dockerfile.in +# Do not edit this file manually, it was generated on 2016-03-31 at 11:08 from slavepython/Dockerfile.in # Define an image for CoolProp Python buildslaves -FROM coolprop/slavebase:latest +FROM coolprop/slavebase:v1.3 # File Author / Maintainer MAINTAINER Jorrit Wronski # Make sure the follwoing commands are run as root user USER root WORKDIR /root # Install system tools for compilation of Python extensions numpy-scipy-pandas -RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y \ +RUN apt-key update -qq && apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y \ build-essential gcc python-dev libhdf5-serial-dev libnetcdf-dev liblapack-dev libatlas-dev libblas-dev && \ DEBIAN_FRONTEND="noninteractive" apt-get autoclean && DEBIAN_FRONTEND="noninteractive" apt-get clean && DEBIAN_FRONTEND="noninteractive" apt-get autoremove # Make sure the following commands are run as the buildbot user @@ -17,4 +17,4 @@ WORKDIR /home/buildbot 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/miniconda2/bin:$PATH" >> /home/buildbot/.bash_profile ENV PATH /home/buildbot/miniconda3/bin:/home/buildbot/miniconda2/bin:$PATH # Add the miniconda environments for the Python builds -RUN conda install conda-build && conda create -n CoolProp27 python=2.7 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda create -n CoolProp33 python=3.3 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda create -n CoolProp34 python=3.4 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda clean -yilts +RUN conda install conda-build && conda create -n CoolProp27 python=2.7 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda create -n CoolProp33 python=3.3 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda create -n CoolProp34 python=3.4 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda create -n CoolProp35 python=3.5 cython pip requests jinja2 pyyaml pycrypto numpy scipy matplotlib pandas wheel && conda clean -yilts