From 6bfe7bbea2a64ceec171b4c6e6b8569b2fa8d6eb Mon Sep 17 00:00:00 2001
From: Tru Huynh <tru@pasteur.fr>
Date: Wed, 1 Mar 2023 19:22:29 +0100
Subject: [PATCH] reset recipe

---
 Dockerfile  | 13 ++++---------
 Singularity | 13 ++++++++-----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 8b8e489..4095cea 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -9,13 +9,8 @@ RUN	conda update conda && \
 	DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \
 	DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean
 
-# download the yml file
-RUN curl https://gitlab.pasteur.fr/tru/miniconda3-python310-pytorch-cuda11.7/-/raw/main/conda-env-export.yml > conda-env-export.yml && \
-	conda create --name py310-pytorch --file conda-env-export.yml && \
+RUN	conda create --name py310-pytorch-1.13.1 -y && \
 	eval "$(conda shell.bash hook)"  && \
-	conda activate py310-pytorch  && \
-	conda list --explicit > /tmp/conda-list--explicit.yml
-
-
-
-
+	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
diff --git a/Singularity b/Singularity
index 2856df1..e7d1f39 100644
--- a/Singularity
+++ b/Singularity
@@ -11,10 +11,13 @@ DEBIAN_FRONTEND=noninteractive apt-get -y upgrade && \
 DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \
 DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean
 
-# download the yml file
-curl https://gitlab.pasteur.fr/tru/miniconda3-python310-pytorch-cuda11.7/-/raw/main/conda-env-export.yml > conda-env-export.yml && \
-conda create --name py310-pytorch --file conda-env-export.yml && \
+conda create --name py310-pytorch-1.13.1 -y && \
 eval "$(conda shell.bash hook)"  && \
-conda activate py310-pytorch  && \
-conda list --explicit > /tmp/conda-list--explicit.yml
+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
 
+%post
+eval "$(conda shell.bash hook)"  && \
+conda activate py310-pytorch-1.13.1 && \
+"$@"
-- 
GitLab