Merge branch 'develop' into test_merge

ImperialCollegeLondon · Oct 11, 2023 · f1c9f15 · f1c9f15
2 parents c3f2d9e + ef679ad
commit f1c9f15
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ RUN conda init bash && \
     conda config --set always_yes yes --set changeps1 no && \
     conda update -q conda && \
     conda config --set auto_activate_base false && \
-    conda env create -f /sharpy_dir/utils/environment_minimal.yml && conda clean -afy && \
+    conda env create -f /sharpy_dir/utils/environment_new.yml && conda clean -afy && \
     find /miniconda3/ -follow -type f -name '*.a' -delete && \
     find /miniconda3/ -follow -type f -name '*.pyc' -delete && \
     find /miniconda3/ -follow -type f -name '*.js.map' -delete
@@ -40,7 +40,7 @@ RUN conda init bash && \
 RUN ln -s /sharpy_dir/utils/docker/* /root/
 
 RUN cd sharpy_dir && \
-    conda activate sharpy_minimal && \
+    conda activate sharpy && \
     git submodule update --init --recursive && \
     mkdir build && \
     cd build && \