tweak

Signed-off-by: vsoch <vsoch@users.noreply.github.com>
rse-ops · Mar 24, 2023 · f58456c · f58456c
1 parent 584c023
commit f58456c
Showing 1 changed file with 6 additions and 6 deletions.
diff --git a/Dockerfile.mamba-env b/Dockerfile.mamba-env
@@ -51,16 +51,16 @@ RUN apt-get update && \
     rm -rf /var/lib/apt/lists/*
 
 # Python - instead of a system python we install mamba to an environment
+ENV PATH /opt/conda/envs/fluxenv/bin:/opt/conda/bin:${PATH}
 RUN /bin/bash -c "curl -L https://github.com/conda-forge/miniforge/releases/latest/download/Mambaforge-Linux-x86_64.sh > mambaforge.sh && \
     bash mambaforge.sh -b -p /opt/conda && \
+    export PATH=/opt/conda/bin:$PATH  && \  
     conda config --system --set channel_priority strict && \
     rm mambaforge.sh" && \
-    export PATH=/opt/conda/bin:$PATH  && \  
     /bin/bash -c "mamba create -q -y -c conda-forge -c bioconda -n fluxenv \
     coverage cffi ply six pyyaml --only-deps"
 RUN echo "source activate fluxenv" > /root/.bashrc
 RUN echo "source activate fluxenv" > /home/fluxuser/.bashrc
-ENV PATH /opt/conda/envs/fluxenv/bin:${PATH}
 
 # Other deps
 RUN apt-get update && \
@@ -120,13 +120,13 @@ RUN git clone https://github.com/openpmix/openpmix.git && \
     cd openpmix && \
     git checkout fefaed568f33bf86f28afb6e45237f1ec5e4de93 && \
     ./autogen.pl && \
-    PYTHON=/opt/conda/bin/python ./configure --prefix=/usr --disable-static && make -j 4 install && \
+    PYTHON=/opt/conda/envs/fluxenv/bin/python ./configure --prefix=/usr --disable-static && make -j 4 install && \
     ldconfig && \
     cd .. && \
     cd prrte && \
     git checkout 477894f4720d822b15cab56eee7665107832921c && \
     ./autogen.pl && \
-    PYTHON=/opt/conda/bin/python ./configure --prefix=/usr && make -j 4 install && \
+    PYTHON=/opt/conda/envs/fluxenv/bin/python ./configure --prefix=/usr && make -j 4 install && \
     cd ../.. && \
     rm -rf prrte
 
@@ -149,7 +149,7 @@ RUN CCACHE_DISABLE=1 && \
     wget ${URL}/v${V}/${PKG}.tar.gz && \
     tar xvfz ${PKG}.tar.gz && \
     cd ${PKG} && \
-    PYTHON=/opt/conda/bin/python ./configure --prefix=/usr --sysconfdir=/etc || cat config.log && \
+    PYTHON=/opt/conda/envs/fluxenv/bin/python ./configure --prefix=/usr --sysconfdir=/etc || cat config.log && \
     make -j 4 && \
     make install && \
     cd .. && \
@@ -201,7 +201,7 @@ ENV LD_LIBRARY_PATH=/opt/conda/envs/fluxenv/lib:$LD_LIBRARY_PATH
 RUN git clone --depth 1 https://github.com/flux-framework/flux-sched && \
     cd flux-sched && \
     ./autogen.sh && \
-    PYTHON=/opt/conda/bin/python ./configure --prefix=/usr --sysconfdir=/etc \
+    PYTHON=/opt/conda/envs/fluxenv/bin/python ./configure --prefix=/usr --sysconfdir=/etc \
        --with-systemdsystemunitdir=/etc/systemd/system \
        --localstatedir=/var \
        --with-flux-security \