From 4bd2232456a08d19cc5044aa1896c7e88ffc7821 Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Wed, 6 Mar 2019 14:58:30 +0800 Subject: [PATCH 1/6] support zsh Signed-off-by: Peng Gao --- base/Dockerfile | 1 + 1 file changed, 1 insertion(+) diff --git a/base/Dockerfile b/base/Dockerfile index 6e2b609..6bfb50a 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -44,6 +44,7 @@ RUN apt-get update && apt-get -yqq dist-upgrade && \ texlive-latex-base \ texlive-latex-extra \ unzip \ + zsh \ vim \ && \ # Setup locales From 69e584265fa46ac20a4de8e4fa2466df38a2bf47 Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Thu, 7 Mar 2019 11:57:34 +0800 Subject: [PATCH 2/6] rm mirror Signed-off-by: Peng Gao --- base/Dockerfile | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index 6bfb50a..d922918 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -152,8 +152,6 @@ RUN echo "Install R and R basic packages" && \ conda config --add channels omgarcia && \ conda config --add channels cgat && \ conda config --add channels sebp && \ - conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/bioconda/ && \ - conda config --add channels https://mirrors.tuna.tsinghua.edu.cn/anaconda/cloud/conda-forge/ && \ conda install -y \ 'r-tm' \ 'r-rcolorbrewer' \ @@ -176,8 +174,7 @@ RUN echo "Install R and R basic packages" && \ install.packages('wordcloud'); \ install.packages('wordcloud2'); \ install.packages('xgboost'); \ - install.packages('plotly');" && \ - echo 'options("repos" = c(CRAN="https://mirrors.tuna.tsinghua.edu.cn/CRAN/"))' > ~/.Rprofile && \ + install.packages('plotly');" \ conda clean -tipsy # Add Julia packages. Only add HDF5 if this is not a test-only build since From 98f0ef498728c3eb1dfb7ba1af036d7564318bea Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Thu, 7 Mar 2019 15:42:17 +0800 Subject: [PATCH 3/6] rm channels Signed-off-by: Peng Gao --- base/Dockerfile | 6 ------ 1 file changed, 6 deletions(-) diff --git a/base/Dockerfile b/base/Dockerfile index d922918..c697d53 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -146,12 +146,6 @@ RUN echo "Install R and R basic packages" && \ conda config --add channels conda-forge && \ conda install -y \ 'r-essentials=3.5.1' && \ - conda config --add channels ataenzer && \ - conda config --add channels jsignell && \ - conda config --add channels pjones && \ - conda config --add channels omgarcia && \ - conda config --add channels cgat && \ - conda config --add channels sebp && \ conda install -y \ 'r-tm' \ 'r-rcolorbrewer' \ From 22dc8d939b97c9fe3879beaa05e5c3fd8a0a00ae Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Wed, 13 Mar 2019 10:36:08 +0800 Subject: [PATCH 4/6] add channels Signed-off-by: Peng Gao --- base/Dockerfile | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/base/Dockerfile b/base/Dockerfile index c697d53..d922918 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -146,6 +146,12 @@ RUN echo "Install R and R basic packages" && \ conda config --add channels conda-forge && \ conda install -y \ 'r-essentials=3.5.1' && \ + conda config --add channels ataenzer && \ + conda config --add channels jsignell && \ + conda config --add channels pjones && \ + conda config --add channels omgarcia && \ + conda config --add channels cgat && \ + conda config --add channels sebp && \ conda install -y \ 'r-tm' \ 'r-rcolorbrewer' \ From 2c97f6bae7715d978cdbda1ab099ce00b595f951 Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Fri, 15 Mar 2019 10:53:58 +0800 Subject: [PATCH 5/6] update Dockerfile Signed-off-by: Peng Gao --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index d922918..6375e92 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -144,7 +144,7 @@ USER $NB_USER RUN echo "Install R and R basic packages" && \ conda config --add channels conda-forge && \ - conda install -y \ + conda install -c -r -y \ 'r-essentials=3.5.1' && \ conda config --add channels ataenzer && \ conda config --add channels jsignell && \ From 8ebfa36da413e3a174082ebfba2fd1738d6ebd54 Mon Sep 17 00:00:00 2001 From: Peng Gao Date: Fri, 15 Mar 2019 14:34:12 +0800 Subject: [PATCH 6/6] update r Signed-off-by: Peng Gao --- base/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/base/Dockerfile b/base/Dockerfile index 6375e92..82a0273 100644 --- a/base/Dockerfile +++ b/base/Dockerfile @@ -144,7 +144,7 @@ USER $NB_USER RUN echo "Install R and R basic packages" && \ conda config --add channels conda-forge && \ - conda install -c -r -y \ + conda install -c r -y \ 'r-essentials=3.5.1' && \ conda config --add channels ataenzer && \ conda config --add channels jsignell && \