summaryrefslogtreecommitdiffstats
path: root/python
diff options
context:
space:
mode:
authorWillem Jan Palenstijn <Willem.Jan.Palenstijn@cwi.nl>2019-09-17 15:29:56 +0200
committerGitHub <noreply@github.com>2019-09-17 15:29:56 +0200
commit0c6dac57f24113be318484cd513f153ee658b261 (patch)
tree3f91512dc967ce6a301f086df324fc92dc5e256a /python
parenta95976b17403b1e68977a59a557686afb3369dd5 (diff)
parentb5f4ef24829d7a10a763dd1f204277b9012d1eb6 (diff)
downloadastra-0c6dac57f24113be318484cd513f153ee658b261.tar.gz
astra-0c6dac57f24113be318484cd513f153ee658b261.tar.bz2
astra-0c6dac57f24113be318484cd513f153ee658b261.tar.xz
astra-0c6dac57f24113be318484cd513f153ee658b261.zip
Merge pull request #213 from ahendriksen/CI-update-conda
Use recent version of conda during linux conda-build
Diffstat (limited to 'python')
-rw-r--r--python/conda/linux_release/buildenv/Dockerfile9
1 files changed, 8 insertions, 1 deletions
diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile
index 7046aca..503d1de 100644
--- a/python/conda/linux_release/buildenv/Dockerfile
+++ b/python/conda/linux_release/buildenv/Dockerfile
@@ -48,4 +48,11 @@ ENV PATH /root/miniconda3/bin:$PATH
COPY Miniconda3-4.5.4-Linux-x86_64.sh /root/
RUN /bin/bash /root/Miniconda3-4.5.4-Linux-x86_64.sh -b && \
rm -f /root/Miniconda3*
-RUN conda install -y conda-build conda-verify conda=4.6.14
+
+RUN conda install -y conda-build conda-verify
+
+# cudatoolkit < 9.0 is not easily available anymore from recent versions of conda.
+# We have to enable the free channel (globally) to reenable old versions of cudatookit..
+# See: https://docs.conda.io/projects/conda/en/latest/user-guide/configuration/free-channel.html#troubleshooting
+# TODO: Remove when support for cudatoolkit 8.0 is dropped.
+RUN conda config --set restore_free_channel true