From 2f31eb164f374956c37357d4e1a7ff8b267240dc Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Thu, 16 Jul 2020 17:48:03 +0200 Subject: [PATCH 1/2] Update dockerfile --- docker/dockerfile | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index 7f219776..d213cf1e 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -12,15 +12,12 @@ RUN conda update -y conda pip # unzip # install environment packages -COPY . /home/root/source -WORKDIR /home/root/source -RUN ls -RUN conda env update --name base --file environment.yml && conda clean --all -y +COPY . /src/earthdiagnostics +WORKDIR /src RUN git clone https://earth.bsc.es/gitlab/es/diagonals.git -RUN pip install ./diagonals -RUN pip install /home/root/source -RUN rm -r diagonals -RUN rm -r /home/root/source +RUN conda env update --name base --file earthdiagnostics/environment.yml && conda clean --all -y +RUN pip install ./diagonals ./earthdiagnostics && pip cache purge +RUN rm -r /src # run tests RUN earthdiags -h -- GitLab From d1f0f6b4107519adb457f04705a342d94c8a5707 Mon Sep 17 00:00:00 2001 From: Javier Vegas-Regidor Date: Thu, 16 Jul 2020 18:00:11 +0200 Subject: [PATCH 2/2] Simplify steps in dockerfile --- docker/dockerfile | 15 ++------------- 1 file changed, 2 insertions(+), 13 deletions(-) diff --git a/docker/dockerfile b/docker/dockerfile index d213cf1e..f1fec2ad 100644 --- a/docker/dockerfile +++ b/docker/dockerfile @@ -1,21 +1,10 @@ #FROM continuumio/miniconda3:jessie-20190506 FROM bsces/miniconda3:debian-stretch-20190610 - -# update the conda packages -RUN conda update -y conda pip - -# # install development tools -# RUN apt-get update -y && apt-get install -y \ -# build-essential \ -# curl \ -# unzip - -# install environment packages COPY . /src/earthdiagnostics WORKDIR /src -RUN git clone https://earth.bsc.es/gitlab/es/diagonals.git -RUN conda env update --name base --file earthdiagnostics/environment.yml && conda clean --all -y +RUN git clone https://earth.bsc.es/gitlab/es/diagonals.git +RUN conda update -y conda pip && conda env update --name base --file earthdiagnostics/environment.yml && conda clean --all -y RUN pip install ./diagonals ./earthdiagnostics && pip cache purge RUN rm -r /src -- GitLab