From 966d2bd64c76eb4b8a57f4894288050d671cdb89 Mon Sep 17 00:00:00 2001
From: Jonathan Shimwell <jonathan.shimwell@ukaea.uk>
Date: Wed, 18 Nov 2020 14:13:11 +0000
Subject: [PATCH] removed echo commands

---
 Dockerfile | 36 +++++++++++++-----------------------
 1 file changed, 13 insertions(+), 23 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index b27bac43b..2ff1d9cef 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -37,7 +37,7 @@ RUN git clone https://github.com/njoy/NJOY2016 /opt/NJOY2016 && \
 
 # Clone and install OpenMC without DAGMC
 RUN if [ "$include_dagmc" = "false" ] ; \
-    then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git \
+    then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \
     /opt/openmc ; \
     cd /opt/openmc ; \
     mkdir -p build ; \
@@ -55,16 +55,13 @@ RUN if [ "$include_dagmc" = "true" ] ; \
     apt-get --yes install libblas-dev ; \
     apt-get --yes install liblapack-dev ; \
     apt-get --yes install libnetcdf-dev ; \
-    #apt-get --yes install libnetcdf13 ; \
     apt-get --yes install libtbb-dev ; \
     apt-get --yes install libglfw3-dev ; \
     fi
 
-
 # Clone and install Embree
 RUN if [ "$include_dagmc" = "true" ] ; \
-    then echo installing embree ; \
-    git clone https://github.com/embree/embree ; \
+    then git clone https://github.com/embree/embree ; \
     cd embree ; \
     mkdir build ; \
     cd build ; \
@@ -74,7 +71,6 @@ RUN if [ "$include_dagmc" = "true" ] ; \
     make install ; \
     fi
 
-
 # Clone and install MOAB
 RUN if [ "$include_dagmc" = "true" ] ; \
     then pip install --upgrade numpy cython ; \
@@ -88,7 +84,7 @@ RUN if [ "$include_dagmc" = "true" ] ; \
                 -DBUILD_SHARED_LIBS=OFF \
                 -DENABLE_FORTRAN=OFF \
                 -DCMAKE_INSTALL_PREFIX=/MOAB ; \
-    make -j; \
+    make ; \
     make install ; \
     rm -rf * ; \
     cmake ../moab -DBUILD_SHARED_LIBS=ON \
@@ -97,15 +93,13 @@ RUN if [ "$include_dagmc" = "true" ] ; \
                 -DENABLE_BLASLAPACK=OFF \
                 -DENABLE_FORTRAN=OFF \
                 -DCMAKE_INSTALL_PREFIX=/MOAB ; \
-    make -j; \
+    make ; \
     make install ; \
     fi
 
-
-# Clone and install double-down
+# Clone and install Double-Down
 RUN if [ "$include_dagmc" = "true" ] ; \
-    then echo installing double-down ; \
-    git clone https://github.com/pshriwise/double-down ; \
+    then git clone https://github.com/pshriwise/double-down ; \
     cd double-down ; \
     mkdir build ; \
     cd build ; \
@@ -113,11 +107,10 @@ RUN if [ "$include_dagmc" = "true" ] ; \
         -DMOAB_DIR=/MOAB \
         -DEMBREE_DIR=/embree/lib/cmake/embree-3.12.1 \
         -DEMBREE_ROOT=/embree/lib/cmake/embree-3.12.1 ; \
-    make -j ; \
-    make -j install ; \
+    make ; \
+    make install ; \
     fi
 
-
 # Clone and install DAGMC
 RUN if [ "$include_dagmc" = "true" ] ; \
     then mkdir DAGMC ; \
@@ -130,21 +123,18 @@ RUN if [ "$include_dagmc" = "true" ] ; \
         -DMOAB_DIR=/MOAB \
         -DBUILD_STATIC_LIBS=OFF \
         -DBUILD_STATIC_EXE=OFF ; \
-    make -j install ; \
+    make install ; \
     rm -rf /DAGMC/dagmc /DAGMC/build ; \
     fi
 
-
 # Clone and install OpenMC with DAGMC
 RUN if [ "$include_dagmc" = "true" ] ; \
-    then echo installing openmc with dagmc ; \
-    then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git ; \
-    /opt/openmc ; \
+    then git clone --recurse-submodules https://github.com/openmc-dev/openmc.git /opt/openmc ; \
     cd /opt/openmc ; \
-    mkdir -p build ; \
+    mkdir build ; \
     cd build ; \
-    cmake -Doptimize=on -Ddagmc=ON ; \
-        -DDAGMC_DIR=/DAGMC/ ; \
+    cmake -Doptimize=on -Ddagmc=ON \
+        -DDAGMC_DIR=/DAGMC/ \
         -DHDF5_PREFER_PARALLEL=on ..  ; \
     make  ; \
     make install ; \