From 99bd955ae807ad44ab6914de516d6d4efe9a4e82 Mon Sep 17 00:00:00 2001 From: Manuel Kaufmann Date: Thu, 16 Mar 2017 17:06:54 -0500 Subject: [PATCH 1/3] Add conda-forge channel with the highest channel priority --- Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Dockerfile b/Dockerfile index e083159..78c030d 100644 --- a/Dockerfile +++ b/Dockerfile @@ -46,4 +46,7 @@ RUN curl -O https://repo.continuum.io/miniconda/Miniconda2-4.3.11-Linux-x86_64.s RUN bash Miniconda2-4.3.11-Linux-x86_64.sh -b -p /home/docs/.conda/ env PATH $PATH:/home/docs/.conda/bin +# Add conda-forge channel with the highest channel priority +RUN conda config --add channels conda-forge + CMD ["/bin/bash"] From f4e433a865db88ebe0edae7bd512f82892a4a0b6 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Fri, 17 Mar 2017 10:36:10 -0700 Subject: [PATCH 2/3] Don't auto-upgrade conda --- Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Dockerfile b/Dockerfile index 78c030d..97d8d1c 100644 --- a/Dockerfile +++ b/Dockerfile @@ -48,5 +48,7 @@ env PATH $PATH:/home/docs/.conda/bin # Add conda-forge channel with the highest channel priority RUN conda config --add channels conda-forge +RUN conda config --set auto_update_conda false + CMD ["/bin/bash"] From 91f92fd52a56e55824f45bdbf60031bad8edb696 Mon Sep 17 00:00:00 2001 From: Eric Holscher Date: Fri, 17 Mar 2017 11:26:21 -0700 Subject: [PATCH 3/3] Bump version --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 97d8d1c..201d18f 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,7 +1,7 @@ # Read the Docs - Environment base FROM ubuntu:16.04 MAINTAINER Read the Docs -LABEL version="2.0.1" +LABEL version="2.0.2" ENV DEBIAN_FRONTEND noninteractive ENV APPDIR /app @@ -48,6 +48,7 @@ env PATH $PATH:/home/docs/.conda/bin # Add conda-forge channel with the highest channel priority RUN conda config --add channels conda-forge +# Don't have conda try and upgrade itself, so we can pin a version RUN conda config --set auto_update_conda false