From ecef4bfbdea954958ae98c9ec8cbf9e63f910445 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 15 Oct 2020 17:32:13 -0400 Subject: [PATCH 1/3] ENH Update conda to 4.8.3, latest miniconda version --- miniconda-cuda/Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/miniconda-cuda/Dockerfile b/miniconda-cuda/Dockerfile index 936378c7..1aeb2140 100644 --- a/miniconda-cuda/Dockerfile +++ b/miniconda-cuda/Dockerfile @@ -9,9 +9,9 @@ ARG FULL_CUDA_VER ARG LINUX_VER # Define versions and download locations -ARG CONDA_VER=4.7.12 +ARG CONDA_VER=4.8.3 ARG TINI_VER=v0.18.0 -ARG MINICONDA_URL=http://repo.anaconda.com/miniconda/Miniconda3-${CONDA_VER}-Linux-x86_64.sh +ARG MINICONDA_URL=http://repo.anaconda.com/miniconda/Miniconda3-py38_${CONDA_VER}-Linux-x86_64.sh ARG TINI_URL=https://github.com/krallin/tini/releases/download/${TINI_VER}/tini # Set environment From 525fca43d0b6dc2a1efc0c61ce204411203373e3 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 15 Oct 2020 17:32:54 -0400 Subject: [PATCH 2/3] FIX Prevent conda from updating automatically --- miniconda-cuda/Dockerfile | 1 + rapidsai/base-runtime.Dockerfile | 2 ++ rapidsai/devel-centos7.Dockerfile | 2 ++ rapidsai/devel.Dockerfile | 2 ++ 4 files changed, 7 insertions(+) diff --git a/miniconda-cuda/Dockerfile b/miniconda-cuda/Dockerfile index 1aeb2140..626050f4 100644 --- a/miniconda-cuda/Dockerfile +++ b/miniconda-cuda/Dockerfile @@ -92,6 +92,7 @@ RUN wget --quiet ${MINICONDA_URL} -O /miniconda.sh \ && echo ". /opt/conda/etc/profile.d/conda.sh" >> ~/.bashrc \ && echo "conda activate base" >> ~/.bashrc \ && echo ". /opt/conda/etc/profile.d/conda.sh" >> /etc/skel/.bashrc \ + && echo "auto_update_conda: False" >> /opt/conda/.condarc \ && chmod -R ugo+w /opt/conda \ && ln -s /opt/conda /conda diff --git a/rapidsai/base-runtime.Dockerfile b/rapidsai/base-runtime.Dockerfile index 2729acc7..dcd3eb68 100644 --- a/rapidsai/base-runtime.Dockerfile +++ b/rapidsai/base-runtime.Dockerfile @@ -21,6 +21,7 @@ SHELL ["/bin/bash", "-c"] # Add a condarc for channels and override settings RUN if [ "${RAPIDS_CHANNEL}" == "rapidsai" ] ; then \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ @@ -31,6 +32,7 @@ channels: \n\ && cat /opt/conda/.condarc ; \ else \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ diff --git a/rapidsai/devel-centos7.Dockerfile b/rapidsai/devel-centos7.Dockerfile index b932c5ac..6b535a4e 100644 --- a/rapidsai/devel-centos7.Dockerfile +++ b/rapidsai/devel-centos7.Dockerfile @@ -29,6 +29,7 @@ SHELL ["/bin/bash", "-c"] # Add a condarc for channels and override settings RUN if [ "${RAPIDS_CHANNEL}" == "rapidsai" ] ; then \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ @@ -39,6 +40,7 @@ channels: \n\ && cat /opt/conda/.condarc ; \ else \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ diff --git a/rapidsai/devel.Dockerfile b/rapidsai/devel.Dockerfile index 13114550..76647b60 100644 --- a/rapidsai/devel.Dockerfile +++ b/rapidsai/devel.Dockerfile @@ -27,6 +27,7 @@ SHELL ["/bin/bash", "-c"] # Add a condarc for channels and override settings RUN if [ "${RAPIDS_CHANNEL}" == "rapidsai" ] ; then \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ @@ -37,6 +38,7 @@ channels: \n\ && cat /opt/conda/.condarc ; \ else \ echo -e "\ +auto_update_conda: False \n\ ssl_verify: False \n\ channels: \n\ - gpuci \n\ From b85922a47ec6f922fd37a5a2e7dd9da79137d4e8 Mon Sep 17 00:00:00 2001 From: Mike Wendt Date: Thu, 15 Oct 2020 17:34:56 -0400 Subject: [PATCH 3/3] REV Remove duplicate .condarc file Reverts #137/#138 this was done to fix an issue in `gpuci_conda_retry`. The actual issue was caused by a version mismatch between base/rapids environments which is being fixed by changes in this PR --- rapidsai/base-runtime.Dockerfile | 3 +-- rapidsai/devel-centos7.Dockerfile | 3 +-- rapidsai/devel.Dockerfile | 3 +-- 3 files changed, 3 insertions(+), 6 deletions(-) diff --git a/rapidsai/base-runtime.Dockerfile b/rapidsai/base-runtime.Dockerfile index dcd3eb68..5829dfdd 100644 --- a/rapidsai/base-runtime.Dockerfile +++ b/rapidsai/base-runtime.Dockerfile @@ -59,8 +59,7 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids libstdcxx-ng=${BUILD_STACK_VER} \ python=${PYTHON_VER} \ "setuptools<50" \ - && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc \ - && cp /opt/conda/.condarc /opt/conda/envs/rapids/ + && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc # Create symlink for old scripts expecting `gdf` conda env RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf diff --git a/rapidsai/devel-centos7.Dockerfile b/rapidsai/devel-centos7.Dockerfile index 6b535a4e..bdeb8cea 100644 --- a/rapidsai/devel-centos7.Dockerfile +++ b/rapidsai/devel-centos7.Dockerfile @@ -91,8 +91,7 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids libstdcxx-ng=${BUILD_STACK_VER} \ python=${PYTHON_VER} \ "setuptools<50" \ - && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc \ - && cp /opt/conda/.condarc /opt/conda/envs/rapids/ + && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc # Create symlink for old scripts expecting `gdf` conda env RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf diff --git a/rapidsai/devel.Dockerfile b/rapidsai/devel.Dockerfile index 76647b60..b6a447a4 100644 --- a/rapidsai/devel.Dockerfile +++ b/rapidsai/devel.Dockerfile @@ -108,8 +108,7 @@ RUN gpuci_conda_retry create --no-default-packages --override-channels -n rapids libstdcxx-ng=${BUILD_STACK_VER} \ python=${PYTHON_VER} \ "setuptools<50" \ - && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc \ - && cp /opt/conda/.condarc /opt/conda/envs/rapids/ + && sed -i 's/conda activate base/conda activate rapids/g' ~/.bashrc # Create symlink for old scripts expecting `gdf` conda env RUN ln -s /opt/conda/envs/rapids /opt/conda/envs/gdf