From a702a2c7dd258130a91ff5ff0c6a6f96bbacc073 Mon Sep 17 00:00:00 2001 From: Jennifer Rinker <rink@win.dtu.dk> Date: Wed, 2 May 2018 18:19:00 +0200 Subject: [PATCH] changed docker setup to pass tests --- docker/Dockerfile_simple | 31 ++++++++++++++----------------- docker/requirements_simple.txt | 8 -------- 2 files changed, 14 insertions(+), 25 deletions(-) delete mode 100644 docker/requirements_simple.txt diff --git a/docker/Dockerfile_simple b/docker/Dockerfile_simple index f0f0899c..0dcd669b 100644 --- a/docker/Dockerfile_simple +++ b/docker/Dockerfile_simple @@ -1,25 +1,22 @@ # ================================================================== # Creating a simple docker image for TOPFARM testing and docs # ================================================================== - -# set the base image FROM continuumio/anaconda3:latest +MAINTAINER Jenni Rinker <rink@dtu.dk> + -# define the maintainer -MAINTAINER Jennifer Rinker <rink@dtu.dk> +# get list of update linux files and install lib for matplotlib +# (anaconda3:5.0.0 image doesn't have the library) +RUN apt update && \ + apt install libgl1-mesa-glx -y -# update the application repository list -RUN apt-get update \ - && apt-get install -y \ - build-essential \ - gcc \ - gfortran -# create an "install" directory and make it the working directory -RUN mkdir /install -WORKDIR /install +# use conde to update itself and install packages not in the +# anaconda3 image +RUN conda update -y conda &&\ + conda install -y sphinx_rtd_theme && \ + conda install -y pytest-cov && \ + conda clean -y --all -# copy reqs file to /install and install everything -COPY ./requirements_simple.txt /install -RUN pip install --upgrade pip \ - && pip install -r /install/requirements_simple.txt +# use pip to install openmdao (nocache to save space) +RUN pip install --no-cache-dir openmdao diff --git a/docker/requirements_simple.txt b/docker/requirements_simple.txt deleted file mode 100644 index 08567130..00000000 --- a/docker/requirements_simple.txt +++ /dev/null @@ -1,8 +0,0 @@ -# WindIO for ??? --e git+https://github.com/FUSED-Wind/windIO.git#egg=windio -# OpenMDAO for optimization --e git+https://github.com/OpenMDAO/OpenMDAO.git#egg=openmdao -# sphinx read-the-docs theme for documentation -sphinx_rtd_theme -# pytest-cov for coverage report -pytest-cov \ No newline at end of file -- GitLab