From e591d848c51db64ac21a23c14c5d701029952214 Mon Sep 17 00:00:00 2001 From: Kale Franz Date: Mon, 19 Mar 2018 13:45:56 -0500 Subject: [PATCH 1/2] fix #81 activate conda base environment --- anaconda/Dockerfile | 13 ++++++------- anaconda3/Dockerfile | 13 ++++++------- miniconda/Dockerfile | 13 ++++++------- miniconda3/Dockerfile | 11 ++++++----- 4 files changed, 24 insertions(+), 26 deletions(-) diff --git a/anaconda/Dockerfile b/anaconda/Dockerfile index 988a93aa..9af78cca 100644 --- a/anaconda/Dockerfile +++ b/anaconda/Dockerfile @@ -1,17 +1,18 @@ FROM debian:8 -MAINTAINER Kamil Kwiek - ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV PATH /opt/conda/bin:$PATH RUN apt-get update --fix-missing && apt-get install -y wget bzip2 ca-certificates \ libglib2.0-0 libxext6 libsm6 libxrender1 \ git mercurial subversion -RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/archive/Anaconda2-5.1.0-Linux-x86_64.sh -O ~/anaconda.sh && \ +RUN wget --quiet https://repo.continuum.io/archive/Anaconda2-5.1.0-Linux-x86_64.sh -O ~/anaconda.sh && \ /bin/bash ~/anaconda.sh -b -p /opt/conda && \ - rm ~/anaconda.sh + rm ~/anaconda.sh && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate base" >> ~/.bashrc RUN apt-get install -y curl grep sed dpkg && \ TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` && \ @@ -20,7 +21,5 @@ RUN apt-get install -y curl grep sed dpkg && \ rm tini.deb && \ apt-get clean -ENV PATH /opt/conda/bin:$PATH - ENTRYPOINT [ "/usr/bin/tini", "--" ] CMD [ "/bin/bash" ] diff --git a/anaconda3/Dockerfile b/anaconda3/Dockerfile index 9b53d355..d6efa94f 100644 --- a/anaconda3/Dockerfile +++ b/anaconda3/Dockerfile @@ -1,17 +1,18 @@ FROM debian:8 -MAINTAINER Kamil Kwiek - ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV PATH /opt/conda/bin:$PATH RUN apt-get update --fix-missing && apt-get install -y wget bzip2 ca-certificates \ libglib2.0-0 libxext6 libsm6 libxrender1 \ git mercurial subversion -RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/archive/Anaconda3-5.1.0-Linux-x86_64.sh -O ~/anaconda.sh && \ +RUN wget --quiet https://repo.continuum.io/archive/Anaconda3-5.1.0-Linux-x86_64.sh -O ~/anaconda.sh && \ /bin/bash ~/anaconda.sh -b -p /opt/conda && \ - rm ~/anaconda.sh + rm ~/anaconda.sh && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate base" >> ~/.bashrc RUN apt-get install -y curl grep sed dpkg && \ TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` && \ @@ -20,7 +21,5 @@ RUN apt-get install -y curl grep sed dpkg && \ rm tini.deb && \ apt-get clean -ENV PATH /opt/conda/bin:$PATH - ENTRYPOINT [ "/usr/bin/tini", "--" ] CMD [ "/bin/bash" ] diff --git a/miniconda/Dockerfile b/miniconda/Dockerfile index c9fa4082..afd4ebea 100644 --- a/miniconda/Dockerfile +++ b/miniconda/Dockerfile @@ -1,17 +1,18 @@ FROM debian:8 -MAINTAINER Kamil Kwiek - ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV PATH /opt/conda/bin:$PATH RUN apt-get update --fix-missing && apt-get install -y wget bzip2 ca-certificates \ libglib2.0-0 libxext6 libsm6 libxrender1 \ git mercurial subversion -RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.4.10-Linux-x86_64.sh -O ~/miniconda.sh && \ +RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda2-4.4.10-Linux-x86_64.sh -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p /opt/conda && \ - rm ~/miniconda.sh + rm ~/miniconda.sh && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate base" >> ~/.bashrc RUN apt-get install -y curl grep sed dpkg && \ TINI_VERSION=`curl https://github.com/krallin/tini/releases/latest | grep -o "/v.*\"" | sed 's:^..\(.*\).$:\1:'` && \ @@ -20,7 +21,5 @@ RUN apt-get install -y curl grep sed dpkg && \ rm tini.deb && \ apt-get clean -ENV PATH /opt/conda/bin:$PATH - ENTRYPOINT [ "/usr/bin/tini", "--" ] CMD [ "/bin/bash" ] diff --git a/miniconda3/Dockerfile b/miniconda3/Dockerfile index 5c87a902..fa8eb5d8 100644 --- a/miniconda3/Dockerfile +++ b/miniconda3/Dockerfile @@ -1,23 +1,24 @@ FROM debian:8 ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 +ENV PATH /opt/conda/bin:$PATH RUN apt-get update --fix-missing && \ apt-get install -y wget bzip2 ca-certificates curl git && \ apt-get clean && \ rm -rf /var/lib/apt/lists/* -RUN echo 'export PATH=/opt/conda/bin:$PATH' > /etc/profile.d/conda.sh && \ - wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.4.10-Linux-x86_64.sh -O ~/miniconda.sh && \ +RUN wget --quiet https://repo.continuum.io/miniconda/Miniconda3-4.4.10-Linux-x86_64.sh -O ~/miniconda.sh && \ /bin/bash ~/miniconda.sh -b -p /opt/conda && \ rm ~/miniconda.sh && \ - /opt/conda/bin/conda clean -tipsy + /opt/conda/bin/conda clean -tipsy && \ + ln -s /opt/conda/etc/profile.d/conda.sh /etc/profile.d/conda.sh && \ + echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc && \ + echo "conda activate base" >> ~/.bashrc ENV TINI_VERSION v0.16.1 ADD https://github.com/krallin/tini/releases/download/${TINI_VERSION}/tini /usr/bin/tini RUN chmod +x /usr/bin/tini -ENV PATH /opt/conda/bin:$PATH - ENTRYPOINT [ "/usr/bin/tini", "--" ] CMD [ "/bin/bash" ] From 25d9d748ca99a77c253529a9f9ddea67a6e5a0de Mon Sep 17 00:00:00 2001 From: Kale Franz Date: Mon, 19 Mar 2018 13:46:10 -0500 Subject: [PATCH 2/2] use debian:latest --- anaconda/Dockerfile | 2 +- anaconda3/Dockerfile | 2 +- miniconda/Dockerfile | 2 +- miniconda3/Dockerfile | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/anaconda/Dockerfile b/anaconda/Dockerfile index 9af78cca..d43bc866 100644 --- a/anaconda/Dockerfile +++ b/anaconda/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:8 +FROM debian:latest ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH diff --git a/anaconda3/Dockerfile b/anaconda3/Dockerfile index d6efa94f..8de610af 100644 --- a/anaconda3/Dockerfile +++ b/anaconda3/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:8 +FROM debian:latest ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH diff --git a/miniconda/Dockerfile b/miniconda/Dockerfile index afd4ebea..ed1bb414 100644 --- a/miniconda/Dockerfile +++ b/miniconda/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:8 +FROM debian:latest ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH diff --git a/miniconda3/Dockerfile b/miniconda3/Dockerfile index fa8eb5d8..dca754b4 100644 --- a/miniconda3/Dockerfile +++ b/miniconda3/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:8 +FROM debian:latest ENV LANG=C.UTF-8 LC_ALL=C.UTF-8 ENV PATH /opt/conda/bin:$PATH