Build updates for Debian 8 + CUDA10.1

Debian 7 is EOL, and CUDA 10.1 doesn't support its version of glibc.

Hardcoded conda=4.6.14 for now, since 4.7.5 seems to be downloading
corrupted packages when running in docker/linux-64.

2 files changed, 15 insertions, 38 deletions

diff --git a/python/conda/linux_release/buildenv/Dockerfile b/python/conda/linux_release/buildenv/Dockerfile
index 35eec0c..7046aca 100644
--- a/python/conda/linux_release/buildenv/Dockerfile
+++ b/python/conda/linux_release/buildenv/Dockerfile
@@ -1,6 +1,13 @@
-FROM debian:7 AS BUILDBASE
+FROM debian:8 AS BUILDBASE
 ENV DEBIAN_FRONTEND noninteractive
-RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git && rm -rf /var/lib/apt/lists/*
+#RUN echo 'deb http://archive.debian.org/debian/ wheezy main' > /etc/apt/sources.list && echo 'deb http://archive.debian.org/debian-security/ wheezy/updates main' >> /etc/apt/sources.list && apt-get -o Acquire::Check-Valid-Until=false update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/*
+RUN apt-get update && apt-get install -y perl-modules build-essential autoconf libtool automake libboost-dev git libxml2 && rm -rf /var/lib/apt/lists/*
+
+FROM BUILDBASE AS CUDA101
+RUN touch /root/cuda101
+COPY cuda_10.1.168_418.67_linux.run /root
+RUN /bin/bash /root/cuda_10.1.168_418.67_linux.run --toolkit --silent --installpath=/usr/local/cuda-10.1 && \
+	rm -f /root/cuda_10.1.168_418.67_linux.run
 
 FROM BUILDBASE AS CUDA100
 RUN touch /root/cuda100
@@ -29,48 +36,16 @@ COPY cuda_8.0.61.2_linux-run /root
 RUN /bin/bash /root/cuda_8.0.61.2_linux-run --silent --accept-eula && \
 	rm -f /root/cuda_8.0.61.2_linux-run
 
-FROM BUILDBASE AS CUDA75
-RUN touch /root/cuda75
-COPY cuda_7.5.18_linux.run /root
-RUN /bin/bash /root/cuda_7.5.18_linux.run --toolkit --silent && \
-	rm -f /root/cuda_7.5.18_linux.run
-
-FROM BUILDBASE AS CUDA70
-RUN touch /root/cuda70
-COPY cuda_7.0.28_linux.run /root
-RUN /bin/bash /root/cuda_7.0.28_linux.run -toolkit -silent && \
-	rm -f /root/cuda_7.0.28_linux.run
-
-COPY cufft_patch_linux.tar.gz /root
-RUN cd /usr/local/cuda-7.0 && \
-	tar xf /root/cufft_patch_linux.tar.gz && \
-	rm -f /root/cufft_patch_linux.tar.gz
-
-FROM BUILDBASE AS CUDA60
-RUN touch /root/cuda60
-COPY cuda_6.0.37_linux_64.run /root
-RUN /bin/bash /root/cuda_6.0.37_linux_64.run -toolkit -silent && \
-	rm -f /root/cuda_6.0.37_linux_64.run
-
-FROM BUILDBASE AS CUDA55
-RUN touch /root/cuda55
-COPY cuda_5.5.22_linux_64.run /root
-RUN /bin/bash /root/cuda_5.5.22_linux_64.run -toolkit -silent && \
-	rm /root/cuda_5.5.22_linux_64.run
-
 FROM BUILDBASE
 RUN touch /root/cuda
+COPY --from=CUDA101 /usr/local/cuda-10.1 /usr/local/cuda-10.1
 COPY --from=CUDA100 /usr/local/cuda-10.0 /usr/local/cuda-10.0
 COPY --from=CUDA92 /usr/local/cuda-9.2 /usr/local/cuda-9.2
 COPY --from=CUDA90 /usr/local/cuda-9.0 /usr/local/cuda-9.0
 COPY --from=CUDA80 /usr/local/cuda-8.0 /usr/local/cuda-8.0
-COPY --from=CUDA75 /usr/local/cuda-7.5 /usr/local/cuda-7.5
-COPY --from=CUDA70 /usr/local/cuda-7.0 /usr/local/cuda-7.0
-COPY --from=CUDA60 /usr/local/cuda-6.0 /usr/local/cuda-6.0
-COPY --from=CUDA55 /usr/local/cuda-5.5 /usr/local/cuda-5.5
 
 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
+RUN conda install -y conda-build conda-verify conda=4.6.14
diff --git a/python/conda/linux_release/release.sh b/python/conda/linux_release/release.sh
index 554d0ae..2ed3e44 100644
--- a/python/conda/linux_release/release.sh
+++ b/python/conda/linux_release/release.sh
@@ -1,8 +1,10 @@
 #!/bin/bash
 
+set -e
+
 D=`mktemp -d`
 
-for F in https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh  http://developer.download.nvidia.com/compute/cuda/5_5/rel/installers/cuda_5.5.22_linux_64.run http://developer.download.nvidia.com/compute/cuda/6_0/rel/installers/cuda_6.0.37_linux_64.run  http://developer.download.nvidia.com/compute/cuda/7_0/Prod/local_installers/cuda_7.0.28_linux.run http://developer.download.nvidia.com/compute/cuda/7_0/Prod/cufft_update/cufft_patch_linux.tar.gz http://developer.download.nvidia.com/compute/cuda/7.5/Prod/local_installers/cuda_7.5.18_linux.run https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux; do
+for F in https://repo.continuum.io/miniconda/Miniconda3-4.5.4-Linux-x86_64.sh https://developer.nvidia.com/compute/cuda/8.0/Prod2/local_installers/cuda_8.0.61_375.26_linux-run https://developer.nvidia.com/compute/cuda/8.0/Prod2/patches/2/cuda_8.0.61.2_linux-run https://developer.nvidia.com/compute/cuda/9.0/Prod/local_installers/cuda_9.0.176_384.81_linux-run https://developer.nvidia.com/compute/cuda/9.2/Prod2/local_installers/cuda_9.2.148_396.37_linux https://developer.nvidia.com/compute/cuda/10.0/Prod/local_installers/cuda_10.0.130_410.48_linux https://developer.nvidia.com/compute/cuda/10.1/Prod/local_installers/cuda_10.1.168_418.67_linux.run ; do
 	[ -f buildenv/`basename $F` ] || (cd buildenv; wget $F )
 done
 
@@ -10,7 +12,7 @@ docker build -t astra-build-env buildenv
 
 cp buildenv/build.sh $D
 
-docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh 1.9.0.dev10 0
+docker run -v $D:/out:z astra-build-env /bin/bash /out/build.sh 1.9.0.dev11 0
 
 rm -f $D/build.sh