From 17c0af70419f07a6d6cfb4fffa2268251f069335 Mon Sep 17 00:00:00 2001
From: Hartmut Stadie <hartmut.stadie@desy.de>
Date: Mon, 2 Dec 2024 13:33:11 +0100
Subject: [PATCH] redefine shell to use conda env

---
 Dockerfile | 10 ++++------
 1 file changed, 4 insertions(+), 6 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index df39376..9a199b2 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,20 @@
 FROM condaforge/miniforge3:24.9.2-0
 
-SHELL ["/bin/bash", "-c"]
 ARG APPS_DIR=/usr/local
 RUN conda create -y --name geant --channel=conda-forge geant4 root cmake make
 RUN conda clean --all
-RUN conda init
+
+SHELL ["conda", "run", "-n", "geant", "/bin/bash", "-c"]
 
 ARG VMC_DIR=$APPS_DIR/vmc
-RUN . ~/.bashrc
-    conda activate geant && \
-    git clone http://github.com/vmc-project/vmc.git $VMC_DIR/git_source && \
+RUN git clone http://github.com/vmc-project/vmc.git $VMC_DIR/git_source && \
     cd $VMC_DIR && \
     git checkout v2-0 && \
     mkdir build && \
     cd build && \
     cmake -DCMAKE_INSTALL_PREFIX=$VMC_DIR $VMC_DIR/git_source && \
     make -j4 && \
-    maken install && \
+    make install && \
     rm -rf build git_source