diff --git a/Dockerfile b/Dockerfile index b190ef074d8e62dda03e6f3f949b3a32e39768b7..3732d49d0c03e0a7c2db59ed7728a48413ce2899 100644 --- a/Dockerfile +++ b/Dockerfile @@ -7,11 +7,13 @@ RUN apt-get update && \ DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \ DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean -RUN eval "$(micromamba shell hook -s posix )" && \ - micromamba update micromamba && \ - micromamba upgrade --all -y && \ +RUN export MAMBA_ROOT_PREFIX=/opt/conda && \ + eval "$(micromamba shell hook -s posix )" && \ + micromamba update -q -y micromamba -c conda-forge -p ${MAMBA_ROOT_PREFIX} && \ + micromamba update -q -y --all -c conda-forge -p ${MAMBA_ROOT_PREFIX} && \ + mkdir -p ${MAMBA_ROOT_PREFIX}/envs && \ curl https://gitlab.pasteur.fr/tru/micromamba-py310-pytorch-cuda11.7/-/raw/main/conda-env-export.yml > conda-env-export.yml && \ - micromamba create --name py310-pytorch-1.13.1 --file conda-env-export.yml && \ + micromamba create -y --no-deps --name py310-pytorch-1.13.1 --file conda-env-export.yml && \ micromamba activate py310-pytorch-1.13.1 && \ micromamba env export > /conda-env-export.yml diff --git a/Singularity b/Singularity index 07413fea3ce586526c1da36a167fac2a26056396..38d72cc073d67baef142e2bca3fc8f01b06ec0d2 100644 --- a/Singularity +++ b/Singularity @@ -9,15 +9,18 @@ DEBIAN_FRONTEND=noninteractive apt-get -y upgrade && \ DEBIAN_FRONTEND=noninteractive apt-get -y autoremove && \ DEBIAN_FRONTEND=noninteractive apt-get -y clean autoclean +export MAMBA_ROOT_PREFIX=/opt/conda && \ eval "$(micromamba shell hook -s posix )" && \ -micromamba update micromamba && \ -micromamba upgrade --all -y && \ +micromamba update -q -y micromamba -c conda-forge -p ${MAMBA_ROOT_PREFIX} && \ +micromamba update -q -y --all -c conda-forge -p ${MAMBA_ROOT_PREFIX} && \ +mkdir -p ${MAMBA_ROOT_PREFIX}/envs && \ curl https://gitlab.pasteur.fr/tru/micromamba-py310-pytorch-cuda11.7/-/raw/main/conda-env-export.yml > conda-env-export.yml && \ -micromamba create --name py310-pytorch-1.13.1 --file conda-env-export.yml && \ +micromamba create -y --no-deps --name py310-pytorch-1.13.1 --file conda-env-export.yml && \ micromamba activate py310-pytorch-1.13.1 && \ micromamba env export > /conda-env-export.yml %post +export MAMBA_ROOT_PREFIX=/opt/conda && \ eval "$(micromamba shell hook -s posix )" && \ micromamba activate py310-pytorch-1.13.1 && \ "$@" diff --git a/runscript.sh b/runscript.sh index 46158ad91da760a3e0573d470a9a715fb45ffa29..4bff4d0e16e741459b67f7f9d1af1c7b2e434014 100644 --- a/runscript.sh +++ b/runscript.sh @@ -1,4 +1,5 @@ #!/bin/bash +export MAMBA_ROOT_PREFIX=/opt/conda && \ eval "$(micromamba shell hook -s posix)" && \ micromamba activate py310-pytorch-1.13.1 && \ "$@"