From 774ef5b5f50ee426e48c6adcd4b58ca3227a540d Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Thu, 2 Mar 2023 12:52:05 +0100
Subject: [PATCH] back to stripped down conda-list--explicit.yml

---
 Dockerfile                                    |  9 ++++--
 Singularity                                   | 10 +++----
 ...env-export.yml => conda-list--explicit.yml | 28 -------------------
 runscript.sh                                  |  5 ++++
 4 files changed, 17 insertions(+), 35 deletions(-)
 rename conda-env-export.yml => conda-list--explicit.yml (64%)
 create mode 100644 runscript.sh

diff --git a/Dockerfile b/Dockerfile
index 4095cea..9e77a04 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,8 +9,13 @@ RUN	conda update conda && \
 	DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \
 	DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean
 
-RUN	conda create --name py310-pytorch-1.13.1 -y && \
+RUN	curl https://gitlab.pasteur.fr/tru/miniconda3-python310-pytorch-cuda11.7/-/raw/main/conda-list--explicit.yml > conda-list--explicit.yml && \
+	conda create --name py310-pytorch-1.13.1 --file conda-list--explicit.yml && \
 	eval "$(conda shell.bash hook)"  && \
 	conda activate py310-pytorch-1.13.1  && \
-	conda install -y pytorch pytorch-cuda=11.7 -c pytorch -c nvidia && \
 	conda list --explicit > /conda-list--explicit.yml
+
+ADD https://gitlab.pasteur.fr/tru/miniconda3-python310-pytorch-cuda11.7/-/raw/main/runscript.sh /runscript.sh
+RUN chmod 755 /runscript.sh
+
+ENTRYPOINT [ "/runscript.sh"]
diff --git a/Singularity b/Singularity
index e7d1f39..725a8b5 100644
--- a/Singularity
+++ b/Singularity
@@ -11,11 +11,11 @@ DEBIAN_FRONTEND=noninteractive apt-get -y upgrade && \
 DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \
 DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean
 
-conda create --name py310-pytorch-1.13.1 -y && \
-eval "$(conda shell.bash hook)"  && \
-conda activate py310-pytorch-1.13.1  && \
-conda install -y pytorch pytorch-cuda=11.7 -c pytorch -c nvidia && \
-conda list --explicit > /conda-list--explicit.yml
+curl https://gitlab.pasteur.fr/tru/miniconda3-python310-pytorch-cuda11.7/-/raw/main/conda-list--explicit.yml > conda-list--explicit.yml && \
+	conda create --name py310-pytorch-1.13.1 --file conda-list--explicit.yml && \
+	eval "$(conda shell.bash hook)"  && \
+	conda activate py310-pytorch-1.13.1  && \
+	conda list --explicit > /conda-list--explicit.yml
 
 %post
 eval "$(conda shell.bash hook)"  && \
diff --git a/conda-env-export.yml b/conda-list--explicit.yml
similarity index 64%
rename from conda-env-export.yml
rename to conda-list--explicit.yml
index 438d137..dd6df2d 100644
--- a/conda-env-export.yml
+++ b/conda-list--explicit.yml
@@ -5,23 +5,10 @@
 https://repo.anaconda.com/pkgs/main/linux-64/_libgcc_mutex-0.1-main.conda
 https://repo.anaconda.com/pkgs/main/linux-64/blas-1.0-mkl.conda
 https://repo.anaconda.com/pkgs/main/linux-64/ca-certificates-2023.01.10-h06a4308_0.conda
-https://conda.anaconda.org/nvidia/linux-64/cuda-cccl-11.7.91-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-cudart-11.7.99-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-cuobjdump-11.7.91-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-cupti-11.7.101-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-cuxxfilt-11.7.91-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-documentation-12.1.55-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-driver-dev-11.7.99-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-gdb-12.1.55-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-memcheck-11.8.86-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvcc-11.7.99-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvdisasm-12.1.55-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvml-dev-11.7.91-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvprof-12.1.55-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvprune-11.7.91-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-nvrtc-11.7.99-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-nvtx-11.7.91-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-sanitizer-api-12.1.55-0.tar.bz2
 https://repo.anaconda.com/pkgs/main/linux-64/ld_impl_linux-64-2.38-h1181459_1.conda
 https://conda.anaconda.org/nvidia/linux-64/libcublas-11.10.3.66-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/libcufft-10.7.2.124-h4fbf590_0.tar.bz2
@@ -34,26 +21,11 @@ https://conda.anaconda.org/nvidia/linux-64/libnvjpeg-11.8.0.2-0.tar.bz2
 https://repo.anaconda.com/pkgs/main/linux-64/libstdcxx-ng-11.2.0-h1234567_1.conda
 https://conda.anaconda.org/pytorch/noarch/pytorch-mutex-1.0-cuda.tar.bz2
 https://repo.anaconda.com/pkgs/main/noarch/tzdata-2022g-h04d1e81_0.conda
-https://conda.anaconda.org/nvidia/linux-64/cuda-command-line-tools-11.7.1-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-compiler-11.7.1-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-cudart-dev-11.7.99-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-libraries-11.7.1-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvrtc-dev-11.7.99-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-nvvp-12.1.55-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/gds-tools-1.6.0.25-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcublas-dev-11.10.3.66-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcufft-dev-10.7.2.124-h98a8f43_0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcufile-dev-1.6.0.25-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcurand-dev-10.3.2.56-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcusolver-dev-11.4.0.1-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libcusparse-dev-11.7.4.91-0.tar.bz2
 https://repo.anaconda.com/pkgs/main/linux-64/libgomp-11.2.0-h1234567_1.conda
-https://conda.anaconda.org/nvidia/linux-64/libnpp-dev-11.7.4.75-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/libnvjpeg-dev-11.8.0.2-0.tar.bz2
 https://repo.anaconda.com/pkgs/main/linux-64/_openmp_mutex-5.1-1_gnu.conda
-https://conda.anaconda.org/nvidia/linux-64/cuda-libraries-dev-11.7.1-0.tar.bz2
 https://conda.anaconda.org/nvidia/linux-64/cuda-runtime-11.7.1-0.tar.bz2
-https://conda.anaconda.org/nvidia/linux-64/cuda-visual-tools-11.7.1-0.tar.bz2
 https://repo.anaconda.com/pkgs/main/linux-64/libgcc-ng-11.2.0-h1234567_1.conda
 https://repo.anaconda.com/pkgs/main/linux-64/bzip2-1.0.8-h7b6447c_0.conda
 https://conda.anaconda.org/nvidia/linux-64/cuda-tools-11.7.1-0.tar.bz2
diff --git a/runscript.sh b/runscript.sh
new file mode 100644
index 0000000..b0fdf85
--- /dev/null
+++ b/runscript.sh
@@ -0,0 +1,5 @@
+#!/bin/bash
+eval "$(conda shell.bash hook)" && \
+conda activate EnvPasteur && \
+"$@"
+
-- 
GitLab