From 81b4ea3514cb4d3622efadd528d97127108d2086 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Tue, 29 Jan 2019 18:38:32 -0600
Subject: [PATCH 01/16] Adding dockerfile for pyne vs Python3.6/moab5.0/dagmc

---
 pyne_ubuntu.16.04.py3.dockerfile | 88 ++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 pyne_ubuntu.16.04.py3.dockerfile

diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/pyne_ubuntu.16.04.py3.dockerfile
new file mode 100644
index 0000000..06c6669
--- /dev/null
+++ b/pyne_ubuntu.16.04.py3.dockerfile
@@ -0,0 +1,88 @@
+FROM ubuntu:18.04
+
+ENV TZ=America/Chicago
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV HOME /root
+RUN apt-get clean -y
+
+RUN apt-get update
+RUN apt-get install -y --fix-missing \
+    software-properties-common wget g++ \
+    build-essential python3-numpy python3-scipy cython python3-setuptools \
+    python3-nose git cmake vim emacs gfortran libblas-dev \
+    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
+    python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
+    autoconf libtool python-setuptools python3-pip doxygen 
+RUN apt-get clean -y
+                       
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN pip3 install sphinx \
+    cloud_sptheme \
+    prettytable \
+    sphinxcontrib_bibtex \
+    numpydoc \
+    nbconvert \
+    numpy 
+
+# make starting directory
+RUN mkdir -p $HOME/opt
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python3 setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
+    && echo "alias python=python3" >> ~/.bashrc \
+    && echo "alias nosetests=nosetests3" >> ~/.bashrc
+
+RUN gcc --version
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \
+  && cd moab \
+  && git checkout -b Version5.0 origin/Version5.0 \
+  && autoreconf -fi \
+  && cd .. \
+  && mkdir build \
+  && cd build \
+  && ../moab/configure --enable-shared --enable-dagmc  --enable-pymoab \
+                       --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
+                       --prefix=$HOME/opt/moab \
+  && make -j 3 \
+  && make install \
+  && cd .. \
+  && rm -rf build moab
+
+# put MOAB on the path
+ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
+ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+
+
+ENV INSTALL_PATH=$HOME/opt/dagmc
+RUN ls $HOME/opt/moab
+RUN cd /root \\
+    && git clone https://github.com/svalinn/DAGMC.git \
+    && cd DAGMC \
+    && git checkout moab-5.0 \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
+             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
+    && make \
+    && make install
+
+# Install PyNE
+RUN pip3 install cython --force-reinstall
+RUN cd $HOME/opt \
+    && git clone https://github.com/bam241/pyne.git \
+    && cd pyne \
+    && git checkout kkiesling-python3 \
+    && python3 setup.py install --user \
+                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
+ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/
+
+ENV PATH $HOME/.local/bin:$PATH
+RUN cd $HOME && nuc_data_make
+
+# Define default command
+CMD ["/bin/bash"]

From c40d1b0461e8012f45f442d260f51de0d25c2618 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Tue, 29 Jan 2019 23:51:09 -0600
Subject: [PATCH 02/16] adding pyhton2

---
 pyne_ubuntu.16.04.py2.dockerfile | 88 ++++++++++++++++++++++++++++++++
 1 file changed, 88 insertions(+)
 create mode 100644 pyne_ubuntu.16.04.py2.dockerfile

diff --git a/pyne_ubuntu.16.04.py2.dockerfile b/pyne_ubuntu.16.04.py2.dockerfile
new file mode 100644
index 0000000..d2be293
--- /dev/null
+++ b/pyne_ubuntu.16.04.py2.dockerfile
@@ -0,0 +1,88 @@
+FROM ubuntu:18.04
+
+ENV TZ=America/Chicago
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV HOME /root
+RUN apt-get clean -y
+
+RUN apt-get update
+RUN apt-get update
+RUN apt-get install -y --fix-missing \
+    software-properties-common wget g++ \
+    build-essential python-numpy python-scipy cython python-setuptools \
+    python-nose git cmake vim emacs gfortran libblas-dev \
+    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python-tables \
+    python-matplotlib python-jinja2 python-dev libpython-dev \
+    autoconf libtool python-setuptools python-pip doxygen 
+RUN apt-get clean -y
+                       
+RUN pip install sphinx \
+    cloud_sptheme \
+    prettytable \
+    sphinxcontrib_bibtex \
+    numpydoc \
+    nbconvert \
+    numpy 
+
+# make starting directory
+RUN mkdir -p $HOME/opt
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
+    && echo "alias python=python" >> ~/.bashrc \
+    && echo "alias nosetests=nosetests3" >> ~/.bashrc
+
+RUN gcc --version
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \
+  && cd moab \
+  && git checkout -b Version5.0 origin/Version5.0 \
+  && autoreconf -fi \
+  && cd .. \
+  && mkdir build \
+  && cd build \
+  && ../moab/configure --enable-shared --enable-dagmc  --enable-pymoab \
+                       --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
+                       --prefix=$HOME/opt/moab \
+  && make -j 3 \
+  && make install \
+  && cd .. \
+  && rm -rf build moab
+
+# put MOAB on the path
+ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
+ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+
+
+ENV INSTALL_PATH=$HOME/opt/dagmc
+RUN ls $HOME/opt/moab
+RUN cd /root \\
+    && git clone https://github.com/svalinn/DAGMC.git \
+    && cd DAGMC \
+    && git checkout moab-5.0 \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
+             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
+    && make \
+    && make install
+
+# Install PyNE
+RUN pip install cython --force-reinstall
+RUN cd $HOME/opt \
+    && git clone https://github.com/bam241/pyne.git \
+    && cd pyne \
+    && git checkout kkiesling-python3 \
+    && python setup.py install --user \
+                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
+ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
+
+ENV PATH $HOME/.local/bin:$PATH
+RUN cd $HOME && nuc_data_make
+
+# Define default command
+CMD ["/bin/bash"]

From b7759bd2a5b92e5001f41cd44a6dd487ac21bc0b Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 11:16:17 -0600
Subject: [PATCH 03/16] change repo/branch to cnerg/develop

---
 pyne_ubuntu.16.04.py2.dockerfile | 3 +--
 pyne_ubuntu.16.04.py3.dockerfile | 3 +--
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/pyne_ubuntu.16.04.py2.dockerfile b/pyne_ubuntu.16.04.py2.dockerfile
index d2be293..efd7d4e 100644
--- a/pyne_ubuntu.16.04.py2.dockerfile
+++ b/pyne_ubuntu.16.04.py2.dockerfile
@@ -74,9 +74,8 @@ RUN cd /root \\
 # Install PyNE
 RUN pip install cython --force-reinstall
 RUN cd $HOME/opt \
-    && git clone https://github.com/bam241/pyne.git \
+    && git clone https://github.com/cnerg/pyne.git \
     && cd pyne \
-    && git checkout kkiesling-python3 \
     && python setup.py install --user \
                                 --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
 ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/pyne_ubuntu.16.04.py3.dockerfile
index 06c6669..2fa5eb5 100644
--- a/pyne_ubuntu.16.04.py3.dockerfile
+++ b/pyne_ubuntu.16.04.py3.dockerfile
@@ -74,9 +74,8 @@ RUN cd /root \\
 # Install PyNE
 RUN pip3 install cython --force-reinstall
 RUN cd $HOME/opt \
-    && git clone https://github.com/bam241/pyne.git \
+    && git clone https://github.com/cnerg/pyne.git \
     && cd pyne \
-    && git checkout kkiesling-python3 \
     && python3 setup.py install --user \
                                 --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
 ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/

From c243f81068d3122dbc86b93d3bcf96cac6bd9864 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 12:02:24 -0600
Subject: [PATCH 04/16] fixing py3 version

---
 pyne_ubuntu.16.04.py2.dockerfile | 8 ++++----
 pyne_ubuntu.16.04.py3.dockerfile | 8 ++++----
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/pyne_ubuntu.16.04.py2.dockerfile b/pyne_ubuntu.16.04.py2.dockerfile
index efd7d4e..7e72f7c 100644
--- a/pyne_ubuntu.16.04.py2.dockerfile
+++ b/pyne_ubuntu.16.04.py2.dockerfile
@@ -32,7 +32,7 @@ RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
     && echo "alias python=python" >> ~/.bashrc \
     && echo "alias nosetests=nosetests3" >> ~/.bashrc
 
-RUN gcc --version
+RUN pip install cython --force-reinstall
 
 # build MOAB
 RUN cd $HOME/opt \
@@ -40,7 +40,7 @@ RUN cd $HOME/opt \
   && cd moab \
   && git clone https://bitbucket.org/fathomteam/moab \
   && cd moab \
-  && git checkout -b Version5.0 origin/Version5.0 \
+  && git checkout -b Version5.1.0 origin/Version5.1.0 \
   && autoreconf -fi \
   && cd .. \
   && mkdir build \
@@ -63,7 +63,7 @@ RUN ls $HOME/opt/moab
 RUN cd /root \\
     && git clone https://github.com/svalinn/DAGMC.git \
     && cd DAGMC \
-    && git checkout moab-5.0 \
+    && git checkout develop \
     && mkdir bld \
     && cd bld \
     && cmake .. -DMOAB_DIR=$HOME/opt/moab \
@@ -72,10 +72,10 @@ RUN cd /root \\
     && make install
 
 # Install PyNE
-RUN pip install cython --force-reinstall
 RUN cd $HOME/opt \
     && git clone https://github.com/cnerg/pyne.git \
     && cd pyne \
+    && git checkout pymoab_cleanup \
     && python setup.py install --user \
                                 --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
 ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/pyne_ubuntu.16.04.py3.dockerfile
index 2fa5eb5..c65b2f5 100644
--- a/pyne_ubuntu.16.04.py3.dockerfile
+++ b/pyne_ubuntu.16.04.py3.dockerfile
@@ -32,7 +32,7 @@ RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
     && echo "alias python=python3" >> ~/.bashrc \
     && echo "alias nosetests=nosetests3" >> ~/.bashrc
 
-RUN gcc --version
+RUN pip3 install cython --force-reinstall
 
 # build MOAB
 RUN cd $HOME/opt \
@@ -40,7 +40,7 @@ RUN cd $HOME/opt \
   && cd moab \
   && git clone https://bitbucket.org/fathomteam/moab \
   && cd moab \
-  && git checkout -b Version5.0 origin/Version5.0 \
+  && git checkout -b Version5.1.0 origin/Version5.1.0 \
   && autoreconf -fi \
   && cd .. \
   && mkdir build \
@@ -63,7 +63,7 @@ RUN ls $HOME/opt/moab
 RUN cd /root \\
     && git clone https://github.com/svalinn/DAGMC.git \
     && cd DAGMC \
-    && git checkout moab-5.0 \
+    && git checkout develop \
     && mkdir bld \
     && cd bld \
     && cmake .. -DMOAB_DIR=$HOME/opt/moab \
@@ -72,10 +72,10 @@ RUN cd /root \\
     && make install
 
 # Install PyNE
-RUN pip3 install cython --force-reinstall
 RUN cd $HOME/opt \
     && git clone https://github.com/cnerg/pyne.git \
     && cd pyne \
+    && git checkout pymoab_cleanup \
     && python3 setup.py install --user \
                                 --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
 ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/

From c025abb22fc4ec47ac821f37e716526fe5c9999b Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 13:11:21 -0600
Subject: [PATCH 05/16] update py3 to cmake

---
 pyne_ubuntu.16.04.py3.dockerfile | 20 ++++++++++++++++----
 1 file changed, 16 insertions(+), 4 deletions(-)

diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/pyne_ubuntu.16.04.py3.dockerfile
index c65b2f5..deca3cc 100644
--- a/pyne_ubuntu.16.04.py3.dockerfile
+++ b/pyne_ubuntu.16.04.py3.dockerfile
@@ -41,13 +41,25 @@ RUN cd $HOME/opt \
   && git clone https://bitbucket.org/fathomteam/moab \
   && cd moab \
   && git checkout -b Version5.1.0 origin/Version5.1.0 \
-  && autoreconf -fi \
   && cd .. \
   && mkdir build \
   && cd build \
-  && ../moab/configure --enable-shared --enable-dagmc  --enable-pymoab \
-                       --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
-                       --prefix=$HOME/opt/moab \
+  && ls ../moab/ \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+#--enable-shared --enable-dagmc  --enable-pymoab \
+ #                      --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
+  #                     --prefix=$HOME/opt/moab \
+  && make -j 3 \
+  && make install \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+        -DBUILD_SHARED_LIBS=OFF \
+#--enable-shared --enable-dagmc  --enable-pymoab \
+ #                      --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
+  #                     --prefix=$HOME/opt/moab \
   && make -j 3 \
   && make install \
   && cd .. \

From 555b1c667ac076f27aebb578ac05d313519de3ab Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 13:29:47 -0600
Subject: [PATCH 06/16] working py2 with cmake for moab, cleaning some unused
 stuff

---
 pyne_ubuntu.16.04.py2.dockerfile | 14 ++++++++++----
 pyne_ubuntu.16.04.py3.dockerfile |  6 ------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/pyne_ubuntu.16.04.py2.dockerfile b/pyne_ubuntu.16.04.py2.dockerfile
index 7e72f7c..249ad30 100644
--- a/pyne_ubuntu.16.04.py2.dockerfile
+++ b/pyne_ubuntu.16.04.py2.dockerfile
@@ -41,13 +41,19 @@ RUN cd $HOME/opt \
   && git clone https://bitbucket.org/fathomteam/moab \
   && cd moab \
   && git checkout -b Version5.1.0 origin/Version5.1.0 \
-  && autoreconf -fi \
   && cd .. \
   && mkdir build \
   && cd build \
-  && ../moab/configure --enable-shared --enable-dagmc  --enable-pymoab \
-                       --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
-                       --prefix=$HOME/opt/moab \
+  && ls ../moab/ \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+  && make -j 3 \
+  && make install \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+        -DBUILD_SHARED_LIBS=OFF \
   && make -j 3 \
   && make install \
   && cd .. \
diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/pyne_ubuntu.16.04.py3.dockerfile
index deca3cc..236633a 100644
--- a/pyne_ubuntu.16.04.py3.dockerfile
+++ b/pyne_ubuntu.16.04.py3.dockerfile
@@ -48,18 +48,12 @@ RUN cd $HOME/opt \
   && cmake ../moab/ \
         -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
         -DENABLE_HDF5=ON \
-#--enable-shared --enable-dagmc  --enable-pymoab \
- #                      --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
-  #                     --prefix=$HOME/opt/moab \
   && make -j 3 \
   && make install \
   && cmake ../moab/ \
         -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
         -DENABLE_HDF5=ON \
         -DBUILD_SHARED_LIBS=OFF \
-#--enable-shared --enable-dagmc  --enable-pymoab \
- #                      --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial \
-  #                     --prefix=$HOME/opt/moab \
   && make -j 3 \
   && make install \
   && cd .. \

From 04eb705cea96dbe99af8e9ff7c879dd98b1cb1e0 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:11:20 -0600
Subject: [PATCH 07/16] concatenation of dockerfiles

---
 ubuntu.18.04.py2.dockerfile                   | 30 +++++++++++++++++++
 ubuntu.18.04.py3.dockerfile                   | 30 +++++++++++++++++++
 ... ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile | 28 +----------------
 ....04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile | 16 ++++++++++
 ...7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile | 16 ++++++++++
 ...6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile |  0
 ...ython.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh |  7 +++++
 7 files changed, 100 insertions(+), 27 deletions(-)
 create mode 100644 ubuntu.18.04.py2.dockerfile
 create mode 100644 ubuntu.18.04.py3.dockerfile
 rename pyne_ubuntu.16.04.py2.dockerfile => ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile (72%)
 create mode 100644 ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
 create mode 100644 ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
 rename pyne_ubuntu.16.04.py3.dockerfile => ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile (100%)
 create mode 100755 ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh

diff --git a/ubuntu.18.04.py2.dockerfile b/ubuntu.18.04.py2.dockerfile
new file mode 100644
index 0000000..9326954
--- /dev/null
+++ b/ubuntu.18.04.py2.dockerfile
@@ -0,0 +1,30 @@
+FROM ubuntu:18.04
+
+ENV TZ=America/Chicago
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV HOME /root
+RUN apt-get clean -y
+
+RUN apt-get update
+RUN apt-get update
+RUN apt-get install -y --fix-missing \
+    software-properties-common wget g++ \
+    build-essential python-numpy python-scipy cython python-setuptools \
+    python-nose git cmake vim emacs gfortran libblas-dev \
+    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python-tables \
+    python-matplotlib python-jinja2 python-dev libpython-dev \
+    autoconf libtool python-setuptools python-pip doxygen 
+RUN apt-get clean -y
+                       
+RUN pip install sphinx \
+    cloud_sptheme \
+    prettytable \
+    sphinxcontrib_bibtex \
+    numpydoc \
+    nbconvert \
+    numpy 
+
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/ubuntu.18.04.py3.dockerfile b/ubuntu.18.04.py3.dockerfile
new file mode 100644
index 0000000..d0641ae
--- /dev/null
+++ b/ubuntu.18.04.py3.dockerfile
@@ -0,0 +1,30 @@
+FROM ubuntu:18.04
+
+ENV TZ=America/Chicago
+RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
+
+ENV HOME /root
+RUN apt-get clean -y
+
+RUN apt-get update
+RUN apt-get install -y --fix-missing \
+    software-properties-common wget g++ \
+    build-essential python3-numpy python3-scipy cython python3-setuptools \
+    python3-nose git cmake vim emacs gfortran libblas-dev \
+    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
+    python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
+    autoconf libtool python-setuptools python3-pip doxygen 
+RUN apt-get clean -y
+                       
+RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN pip3 install sphinx \
+    cloud_sptheme \
+    prettytable \
+    sphinxcontrib_bibtex \
+    numpydoc \
+    nbconvert \
+    numpy 
+
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/pyne_ubuntu.16.04.py2.dockerfile b/ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile
similarity index 72%
rename from pyne_ubuntu.16.04.py2.dockerfile
rename to ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile
index 249ad30..e088a23 100644
--- a/pyne_ubuntu.16.04.py2.dockerfile
+++ b/ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu:18.04
+FROM ubuntu.18.04_py:2.7
 
 ENV TZ=America/Chicago
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
@@ -63,31 +63,5 @@ RUN cd $HOME/opt \
 ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
 ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
 
-
-ENV INSTALL_PATH=$HOME/opt/dagmc
-RUN ls $HOME/opt/moab
-RUN cd /root \\
-    && git clone https://github.com/svalinn/DAGMC.git \
-    && cd DAGMC \
-    && git checkout develop \
-    && mkdir bld \
-    && cd bld \
-    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
-             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
-    && make \
-    && make install
-
-# Install PyNE
-RUN cd $HOME/opt \
-    && git clone https://github.com/cnerg/pyne.git \
-    && cd pyne \
-    && git checkout pymoab_cleanup \
-    && python setup.py install --user \
-                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
-ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
-
-ENV PATH $HOME/.local/bin:$PATH
-RUN cd $HOME && nuc_data_make
-
 # Define default command
 CMD ["/bin/bash"]
diff --git a/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile b/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
new file mode 100644
index 0000000..7c9b600
--- /dev/null
+++ b/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu.18.04_python.2.7_moab:5.1.0
+
+ENV INSTALL_PATH=$HOME/opt/dagmc
+RUN cd /root \\
+    && git clone https://github.com/svalinn/DAGMC.git \
+    && cd DAGMC \
+    && git checkout develop \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
+             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
+    && make \
+    && make install
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile b/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
new file mode 100644
index 0000000..3d98640
--- /dev/null
+++ b/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
@@ -0,0 +1,16 @@
+FROM ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev
+
+ENV INSTALL_PATH=$HOME/opt/dagmc
+RUN cd /root \\
+    && git clone https://github.com/svalinn/DAGMC.git \
+    && cd DAGMC \
+    && git checkout develop \
+    && mkdir bld \
+    && cd bld \
+    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
+             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
+    && make \
+    && make install
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/pyne_ubuntu.16.04.py3.dockerfile b/ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
similarity index 100%
rename from pyne_ubuntu.16.04.py3.dockerfile
rename to ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
diff --git a/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
new file mode 100755
index 0000000..2786e3f
--- /dev/null
+++ b/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build -t ubuntu.18.04_py:2.7 -f ubuntu.18.04.py2.dockerfile .
+docker build -t ubuntu.18.04_python.2.7_moab:5.1.0 -f ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile .
+docker build -t ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev -f ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile .
+docker build -t ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne:dev -f ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
+

From 044122978459ba335bcdebfd5541e51e28a2b051 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:33:26 -0600
Subject: [PATCH 08/16] update

---
 ....04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile |  0
 ....04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile |  2 +-
 moab                                          | 32 -------
 .../u.18.04_py.2.7_moab.5.1.0.dockerfile      | 26 +-----
 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile     | 43 +++++++++
 ...7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile | 15 +++
 ...6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile | 15 +++
 ...6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile | 93 -------------------
 ...ython.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh |  8 +-
 ...ython.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh |  7 ++
 .../u.18.04.py.2.7.dockerfile                 |  0
 .../u.18.04.py.3.6.dockerfile                 | 18 ++--
 12 files changed, 94 insertions(+), 165 deletions(-)
 rename ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile => dagmc/u.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile (100%)
 rename ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile => dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile (87%)
 delete mode 100644 moab
 rename ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile => moab/u.18.04_py.2.7_moab.5.1.0.dockerfile (61%)
 create mode 100644 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
 create mode 100644 pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
 create mode 100644 pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
 delete mode 100644 ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
 create mode 100755 ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh
 rename ubuntu.18.04.py2.dockerfile => ubuntu/u.18.04.py.2.7.dockerfile (100%)
 rename ubuntu.18.04.py3.dockerfile => ubuntu/u.18.04.py.3.6.dockerfile (66%)

diff --git a/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile b/dagmc/u.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
similarity index 100%
rename from ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
rename to dagmc/u.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile
diff --git a/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile b/dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile
similarity index 87%
rename from ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
rename to dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile
index 3d98640..d51b738 100644
--- a/ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
+++ b/dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile
@@ -1,4 +1,4 @@
-FROM ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev
+FROM ubuntu.18.04_python.3.6_moab:5.1.0
 
 ENV INSTALL_PATH=$HOME/opt/dagmc
 RUN cd /root \\
diff --git a/moab b/moab
deleted file mode 100644
index ea88f8a..0000000
--- a/moab
+++ /dev/null
@@ -1,32 +0,0 @@
-FROM ubuntu:16.04
-
-RUN apt-get -y --force-yes update
-RUN apt-get install -y --force-yes \
-    software-properties-common python-software-properties wget
-
-# moab specific dependencies
-RUN apt-get install -y build-essential git cmake vim autoconf automake libtool libhdf5-dev libeigen3-dev \
-    libblas-dev liblapack-dev gfortran
-
-
-RUN \
-    cd && \
-    git clone --branch fortran_free --single-branch https://bitbucket.org/gonuke/moab
-
-RUN \
-    cd && \
-    cd moab && \
-    mkdir bld_cmake && \
-    cd bld_cmake && \
-    cmake .. -DCMAKE_C_FLAGS="-fPIC -DPIC" -DCMAKE_CXX_FLAGS="-fPIC -DPIC" -DBUILD_SHARED_LIBS=ON \
-       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined" -DENABLE_MPI=OFF  \
-       -DENABLE_HDF5=ON -DHDF5_ROOT=/usr/lib/x86_64-linux-gnu/hdf5/serial \
-       -DENABLE_NETCDF=OFF -DENABLE_METIS=OFF -DENABLE_IMESH=OFF -DENABLE_FBIGEOM=OFF && \
-    make all VERBOSE=1 -j 8
-
-RUN \
-    cd && cd moab/bld_cmake && \
-    make test VERBOSE=1 -j 8
-
-    
-
diff --git a/ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile b/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
similarity index 61%
rename from ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile
rename to moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
index e088a23..fb6ffed 100644
--- a/ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile
+++ b/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
@@ -1,30 +1,5 @@
 FROM ubuntu.18.04_py:2.7
 
-ENV TZ=America/Chicago
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-ENV HOME /root
-RUN apt-get clean -y
-
-RUN apt-get update
-RUN apt-get update
-RUN apt-get install -y --fix-missing \
-    software-properties-common wget g++ \
-    build-essential python-numpy python-scipy cython python-setuptools \
-    python-nose git cmake vim emacs gfortran libblas-dev \
-    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python-tables \
-    python-matplotlib python-jinja2 python-dev libpython-dev \
-    autoconf libtool python-setuptools python-pip doxygen 
-RUN apt-get clean -y
-                       
-RUN pip install sphinx \
-    cloud_sptheme \
-    prettytable \
-    sphinxcontrib_bibtex \
-    numpydoc \
-    nbconvert \
-    numpy 
-
 # make starting directory
 RUN mkdir -p $HOME/opt
 RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
@@ -62,6 +37,7 @@ RUN cd $HOME/opt \
 # put MOAB on the path
 ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
 ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
 
 # Define default command
 CMD ["/bin/bash"]
diff --git a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
new file mode 100644
index 0000000..c7e33d9
--- /dev/null
+++ b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu.18.04_py:3.6
+
+# make starting directory
+RUN mkdir -p $HOME/opt
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
+    && echo "alias python=python" >> ~/.bashrc \
+    && echo "alias nosetests=nosetests3" >> ~/.bashrc
+
+RUN pip install cython --force-reinstall
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \
+  && cd moab \
+  && git checkout -b Version5.1.0 origin/Version5.1.0 \
+  && cd .. \
+  && mkdir build \
+  && cd build \
+  && ls ../moab/ \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+  && make -j 3 \
+  && make install \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+        -DBUILD_SHARED_LIBS=OFF \
+  && make -j 3 \
+  && make install \
+  && cd .. \
+  && rm -rf build moab
+
+# put MOAB on the path
+ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
+ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile b/pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
new file mode 100644
index 0000000..b6f1658
--- /dev/null
+++ b/pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
@@ -0,0 +1,15 @@
+from ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev
+
+# Install PyNE
+RUN cd $HOME/opt \
+    && git clone https://github.com/cnerg/pyne.git \
+    && cd pyne \
+    && git checkout pymoab_cleanup \
+    && python setup.py install --user \
+                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
+
+ENV PATH $HOME/.local/bin:$PATH
+RUN cd $HOME && nuc_data_make
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile b/pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
new file mode 100644
index 0000000..4083682
--- /dev/null
+++ b/pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
@@ -0,0 +1,15 @@
+from ubuntu.18.04_python.3.6_moab.5.1.0_dagmc:dev
+
+# Install PyNE
+RUN cd $HOME/opt \
+    && git clone https://github.com/cnerg/pyne.git \
+    && cd pyne \
+    && git checkout pymoab_cleanup \
+    && python3 setup.py install --user \
+                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
+
+ENV PATH $HOME/.local/bin:$PATH
+RUN cd $HOME && nuc_data_make
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile b/ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
deleted file mode 100644
index 236633a..0000000
--- a/ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile
+++ /dev/null
@@ -1,93 +0,0 @@
-FROM ubuntu:18.04
-
-ENV TZ=America/Chicago
-RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
-
-ENV HOME /root
-RUN apt-get clean -y
-
-RUN apt-get update
-RUN apt-get install -y --fix-missing \
-    software-properties-common wget g++ \
-    build-essential python3-numpy python3-scipy cython python3-setuptools \
-    python3-nose git cmake vim emacs gfortran libblas-dev \
-    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
-    python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
-    autoconf libtool python-setuptools python3-pip doxygen 
-RUN apt-get clean -y
-                       
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-RUN pip3 install sphinx \
-    cloud_sptheme \
-    prettytable \
-    sphinxcontrib_bibtex \
-    numpydoc \
-    nbconvert \
-    numpy 
-
-# make starting directory
-RUN mkdir -p $HOME/opt
-RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
-    && echo "alias build_pyne='python3 setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
-    && echo "alias python=python3" >> ~/.bashrc \
-    && echo "alias nosetests=nosetests3" >> ~/.bashrc
-
-RUN pip3 install cython --force-reinstall
-
-# build MOAB
-RUN cd $HOME/opt \
-  && mkdir moab \
-  && cd moab \
-  && git clone https://bitbucket.org/fathomteam/moab \
-  && cd moab \
-  && git checkout -b Version5.1.0 origin/Version5.1.0 \
-  && cd .. \
-  && mkdir build \
-  && cd build \
-  && ls ../moab/ \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-  && make -j 3 \
-  && make install \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-        -DBUILD_SHARED_LIBS=OFF \
-  && make -j 3 \
-  && make install \
-  && cd .. \
-  && rm -rf build moab
-
-# put MOAB on the path
-ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
-ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
-
-
-ENV INSTALL_PATH=$HOME/opt/dagmc
-RUN ls $HOME/opt/moab
-RUN cd /root \\
-    && git clone https://github.com/svalinn/DAGMC.git \
-    && cd DAGMC \
-    && git checkout develop \
-    && mkdir bld \
-    && cd bld \
-    && cmake .. -DMOAB_DIR=$HOME/opt/moab \
-             -DCMAKE_INSTALL_PREFIX=$INSTALL_PATH \
-    && make \
-    && make install
-
-# Install PyNE
-RUN cd $HOME/opt \
-    && git clone https://github.com/cnerg/pyne.git \
-    && cd pyne \
-    && git checkout pymoab_cleanup \
-    && python3 setup.py install --user \
-                                --moab $HOME/opt/moab --dagmc $HOME/opt/dagmc --clean
-ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/
-
-ENV PATH $HOME/.local/bin:$PATH
-RUN cd $HOME && nuc_data_make
-
-# Define default command
-CMD ["/bin/bash"]
diff --git a/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
index 2786e3f..69272ed 100755
--- a/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
+++ b/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 
-docker build -t ubuntu.18.04_py:2.7 -f ubuntu.18.04.py2.dockerfile .
-docker build -t ubuntu.18.04_python.2.7_moab:5.1.0 -f ubuntu.18.04_py.2.7_moab.5.1.0.dockerfile .
-docker build -t ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev -f ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile .
-docker build -t ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne:dev -f ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
+docker build -t ubuntu.18.04_py:2.7 -f ubuntu/u.18.04.py2.dockerfile .
+docker build -t ubuntu.18.04_python.2.7_moab:5.1.0 -f moab/u.18.04_py.2.7_moab.5.1.0.dockerfile .
+docker build -t ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev -f dagmc/u.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile .
+docker build -t ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne:dev -f pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
 
diff --git a/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh
new file mode 100755
index 0000000..bc9c4b3
--- /dev/null
+++ b/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh
@@ -0,0 +1,7 @@
+#!/bin/bash
+
+docker build -t ubuntu.18.04_py:3.6 -f ubuntu/u.18.04.py2.dockerfile .
+docker build -t ubuntu.18.04_python.3.6_moab:5.1.0 -f moab/u.18.04_py.3.6_moab.5.1.0.dockerfile .
+docker build -t ubuntu.18.04_python.3.6_moab.5.1.0_dagmc:dev -f dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile .
+docker build -t ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne:dev -f pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
+
diff --git a/ubuntu.18.04.py2.dockerfile b/ubuntu/u.18.04.py.2.7.dockerfile
similarity index 100%
rename from ubuntu.18.04.py2.dockerfile
rename to ubuntu/u.18.04.py.2.7.dockerfile
diff --git a/ubuntu.18.04.py3.dockerfile b/ubuntu/u.18.04.py.3.6.dockerfile
similarity index 66%
rename from ubuntu.18.04.py3.dockerfile
rename to ubuntu/u.18.04.py.3.6.dockerfile
index d0641ae..64e6cd5 100644
--- a/ubuntu.18.04.py3.dockerfile
+++ b/ubuntu/u.18.04.py.3.6.dockerfile
@@ -4,27 +4,25 @@ ENV TZ=America/Chicago
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV HOME /root
-RUN apt-get clean -y
 
-RUN apt-get update
-RUN apt-get install -y --fix-missing \
+RUN apt-get update \
+    && apt-get install -y --fix-missing \
     software-properties-common wget g++ \
     build-essential python3-numpy python3-scipy cython python3-setuptools \
     python3-nose git cmake vim emacs gfortran libblas-dev \
     liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
     python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
-    autoconf libtool python-setuptools python3-pip doxygen 
-RUN apt-get clean -y
-                       
-RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-RUN pip3 install sphinx \
+    autoconf libtool python-setuptools python3-pip doxygen \
+    && apt-get clean -y \
+    && update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+RUN pip3 install --force-reinstall \
+    sphinx \
     cloud_sptheme \
     prettytable \
     sphinxcontrib_bibtex \
     numpydoc \
     nbconvert \
-    numpy 
-
+    cython
 
 # Define default command
 CMD ["/bin/bash"]

From 437176ce89cadef23c6d03571fb01c7f56e5b999 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:46:43 -0600
Subject: [PATCH 09/16] more generic script

---
 ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh | 7 -------
 ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh | 7 -------
 2 files changed, 14 deletions(-)
 delete mode 100755 ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
 delete mode 100755 ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh

diff --git a/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
deleted file mode 100755
index 69272ed..0000000
--- a/ubuntu.18.04_python.2.7_moab.5.1.0_dagmc.dev_pyne.dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-docker build -t ubuntu.18.04_py:2.7 -f ubuntu/u.18.04.py2.dockerfile .
-docker build -t ubuntu.18.04_python.2.7_moab:5.1.0 -f moab/u.18.04_py.2.7_moab.5.1.0.dockerfile .
-docker build -t ubuntu.18.04_python.2.7_moab.5.1.0_dagmc:dev -f dagmc/u.18.04_py.2.7_moab.5.1.0_dagmc.dev.dockerfile .
-docker build -t ubuntu.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne:dev -f pyne/u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
-
diff --git a/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh
deleted file mode 100755
index bc9c4b3..0000000
--- a/ubuntu.18.04_python.3.6_moab.5.1.0_dagmc.dev_pyne.dev.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-docker build -t ubuntu.18.04_py:3.6 -f ubuntu/u.18.04.py2.dockerfile .
-docker build -t ubuntu.18.04_python.3.6_moab:5.1.0 -f moab/u.18.04_py.3.6_moab.5.1.0.dockerfile .
-docker build -t ubuntu.18.04_python.3.6_moab.5.1.0_dagmc:dev -f dagmc/u.18.04_py.3.6_moab.5.1.0_dagmc.dev.dockerfile .
-docker build -t ubuntu.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne:dev -f pyne/u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
-

From 8d6fe089331257c8a2c413ddfb54197cfe9efeeb Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:46:58 -0600
Subject: [PATCH 10/16] more generic script

---
 ...04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh | 23 +++++++++++++++++++
 1 file changed, 23 insertions(+)
 create mode 100755 ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh

diff --git a/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh
new file mode 100755
index 0000000..dade831
--- /dev/null
+++ b/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh
@@ -0,0 +1,23 @@
+#!/bin/bash
+
+
+py_v="3.6"
+if [ ! $# -eq 1 ]; then
+    echo "Python version not specified!"
+    echo "Using default version: 3.6"
+elif [ $1 == "3.6" ] || [ $1 == "2.7" ]; then
+    py_v=$1
+else 
+    echo "2.7 and 3.6 are the only supported Python version !"
+    echo "Using default version: 3.6"
+fi
+
+# build Ubuntu 18.04 with required python version
+docker build -t ubuntu.18.04_py:${py_v} -f ubuntu/u.18.04.py.${py_v}.dockerfile .
+# build moab
+docker build -t ubuntu.18.04_python.${py_v}_moab:5.1.0 -f moab/u.18.04_py.${py_v}_moab.5.1.0.dockerfile .
+# build dagmc
+docker build -t ubuntu.18.04_python.${py_v}_moab.5.1.0_dagmc:dev -f dagmc/u.18.04_py.${py_v}_moab.5.1.0_dagmc.dev.dockerfile .
+# build pyne
+docker build -t ubuntu.18.04_py.${py_v}_moab.5.1.0_dagmc.dev_pyne:dev -f pyne/u.18.04_py.${py_v}_moab.5.1.0_dagmc.dev_pyne.dev.dockerfile .
+

From f6df5e756c53a1d96bcc2bee7d38e4878b88dbd4 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:47:50 -0600
Subject: [PATCH 11/16] recover some removed files

---
 moab                                      | 32 +++++++++++++++++
 moab/u.18.04_py.2.7_moab.5.1.0.dockerfile | 43 -----------------------
 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile | 43 -----------------------
 3 files changed, 32 insertions(+), 86 deletions(-)
 create mode 100644 moab
 delete mode 100644 moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
 delete mode 100644 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile

diff --git a/moab b/moab
new file mode 100644
index 0000000..ea88f8a
--- /dev/null
+++ b/moab
@@ -0,0 +1,32 @@
+FROM ubuntu:16.04
+
+RUN apt-get -y --force-yes update
+RUN apt-get install -y --force-yes \
+    software-properties-common python-software-properties wget
+
+# moab specific dependencies
+RUN apt-get install -y build-essential git cmake vim autoconf automake libtool libhdf5-dev libeigen3-dev \
+    libblas-dev liblapack-dev gfortran
+
+
+RUN \
+    cd && \
+    git clone --branch fortran_free --single-branch https://bitbucket.org/gonuke/moab
+
+RUN \
+    cd && \
+    cd moab && \
+    mkdir bld_cmake && \
+    cd bld_cmake && \
+    cmake .. -DCMAKE_C_FLAGS="-fPIC -DPIC" -DCMAKE_CXX_FLAGS="-fPIC -DPIC" -DBUILD_SHARED_LIBS=ON \
+       -DCMAKE_SHARED_LINKER_FLAGS="-Wl,--no-undefined" -DENABLE_MPI=OFF  \
+       -DENABLE_HDF5=ON -DHDF5_ROOT=/usr/lib/x86_64-linux-gnu/hdf5/serial \
+       -DENABLE_NETCDF=OFF -DENABLE_METIS=OFF -DENABLE_IMESH=OFF -DENABLE_FBIGEOM=OFF && \
+    make all VERBOSE=1 -j 8
+
+RUN \
+    cd && cd moab/bld_cmake && \
+    make test VERBOSE=1 -j 8
+
+    
+
diff --git a/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile b/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
deleted file mode 100644
index fb6ffed..0000000
--- a/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM ubuntu.18.04_py:2.7
-
-# make starting directory
-RUN mkdir -p $HOME/opt
-RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
-    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
-    && echo "alias python=python" >> ~/.bashrc \
-    && echo "alias nosetests=nosetests3" >> ~/.bashrc
-
-RUN pip install cython --force-reinstall
-
-# build MOAB
-RUN cd $HOME/opt \
-  && mkdir moab \
-  && cd moab \
-  && git clone https://bitbucket.org/fathomteam/moab \
-  && cd moab \
-  && git checkout -b Version5.1.0 origin/Version5.1.0 \
-  && cd .. \
-  && mkdir build \
-  && cd build \
-  && ls ../moab/ \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-  && make -j 3 \
-  && make install \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-        -DBUILD_SHARED_LIBS=OFF \
-  && make -j 3 \
-  && make install \
-  && cd .. \
-  && rm -rf build moab
-
-# put MOAB on the path
-ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
-ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
-ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
-
-# Define default command
-CMD ["/bin/bash"]
diff --git a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
deleted file mode 100644
index c7e33d9..0000000
--- a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
+++ /dev/null
@@ -1,43 +0,0 @@
-FROM ubuntu.18.04_py:3.6
-
-# make starting directory
-RUN mkdir -p $HOME/opt
-RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
-    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
-    && echo "alias python=python" >> ~/.bashrc \
-    && echo "alias nosetests=nosetests3" >> ~/.bashrc
-
-RUN pip install cython --force-reinstall
-
-# build MOAB
-RUN cd $HOME/opt \
-  && mkdir moab \
-  && cd moab \
-  && git clone https://bitbucket.org/fathomteam/moab \
-  && cd moab \
-  && git checkout -b Version5.1.0 origin/Version5.1.0 \
-  && cd .. \
-  && mkdir build \
-  && cd build \
-  && ls ../moab/ \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-  && make -j 3 \
-  && make install \
-  && cmake ../moab/ \
-        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
-        -DENABLE_HDF5=ON \
-        -DBUILD_SHARED_LIBS=OFF \
-  && make -j 3 \
-  && make install \
-  && cd .. \
-  && rm -rf build moab
-
-# put MOAB on the path
-ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
-ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
-ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/
-
-# Define default command
-CMD ["/bin/bash"]

From d60df3c053512e30e5715c355d7e152ae66c2381 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:52:25 -0600
Subject: [PATCH 12/16] solve moab conflict

---
 moab => moab.dockerfile                   |  0
 moab/u.18.04_py.2.7_moab.5.1.0.dockerfile | 43 +++++++++++++++++++++++
 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile | 43 +++++++++++++++++++++++
 3 files changed, 86 insertions(+)
 rename moab => moab.dockerfile (100%)
 create mode 100644 moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
 create mode 100644 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile

diff --git a/moab b/moab.dockerfile
similarity index 100%
rename from moab
rename to moab.dockerfile
diff --git a/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile b/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
new file mode 100644
index 0000000..fb6ffed
--- /dev/null
+++ b/moab/u.18.04_py.2.7_moab.5.1.0.dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu.18.04_py:2.7
+
+# make starting directory
+RUN mkdir -p $HOME/opt
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
+    && echo "alias python=python" >> ~/.bashrc \
+    && echo "alias nosetests=nosetests3" >> ~/.bashrc
+
+RUN pip install cython --force-reinstall
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \
+  && cd moab \
+  && git checkout -b Version5.1.0 origin/Version5.1.0 \
+  && cd .. \
+  && mkdir build \
+  && cd build \
+  && ls ../moab/ \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+  && make -j 3 \
+  && make install \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+        -DBUILD_SHARED_LIBS=OFF \
+  && make -j 3 \
+  && make install \
+  && cd .. \
+  && rm -rf build moab
+
+# put MOAB on the path
+ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
+ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+ENV PYTHONPATH=$HOME/opt/moab/lib/python2.7/site-packages/
+
+# Define default command
+CMD ["/bin/bash"]
diff --git a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
new file mode 100644
index 0000000..c7e33d9
--- /dev/null
+++ b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
@@ -0,0 +1,43 @@
+FROM ubuntu.18.04_py:3.6
+
+# make starting directory
+RUN mkdir -p $HOME/opt
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python setup.py install --user -j 3 -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc \
+    && echo "alias python=python" >> ~/.bashrc \
+    && echo "alias nosetests=nosetests3" >> ~/.bashrc
+
+RUN pip install cython --force-reinstall
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \
+  && cd moab \
+  && git checkout -b Version5.1.0 origin/Version5.1.0 \
+  && cd .. \
+  && mkdir build \
+  && cd build \
+  && ls ../moab/ \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+  && make -j 3 \
+  && make install \
+  && cmake ../moab/ \
+        -DCMAKE_INSTALL_PREFIX=$HOME/opt/moab \
+        -DENABLE_HDF5=ON \
+        -DBUILD_SHARED_LIBS=OFF \
+  && make -j 3 \
+  && make install \
+  && cd .. \
+  && rm -rf build moab
+
+# put MOAB on the path
+ENV LD_LIBRARY_PATH $HOME/opt/moab/lib:$LD_LIBRARY_PATH
+ENV LIBRARY_PATH $HOME/opt/moab/lib:$LIBRARY_PATH
+ENV PYTHONPATH=$HOME/opt/moab/lib/python3.6/site-packages/
+
+# Define default command
+CMD ["/bin/bash"]

From 985e99a344e17e28fc3a1e89a3bd42539ab71767 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:55:47 -0600
Subject: [PATCH 13/16] fix some bug in docker file

---
 moab/u.18.04_py.3.6_moab.5.1.0.dockerfile |  2 --
 ubuntu/u.18.04.py.2.7.dockerfile          | 36 ++++++++++-------------
 ubuntu/u.18.04.py.3.6.dockerfile          | 28 +++++++++---------
 3 files changed, 30 insertions(+), 36 deletions(-)

diff --git a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
index c7e33d9..51242e0 100644
--- a/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
+++ b/moab/u.18.04_py.3.6_moab.5.1.0.dockerfile
@@ -7,8 +7,6 @@ RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
     && echo "alias python=python" >> ~/.bashrc \
     && echo "alias nosetests=nosetests3" >> ~/.bashrc
 
-RUN pip install cython --force-reinstall
-
 # build MOAB
 RUN cd $HOME/opt \
   && mkdir moab \
diff --git a/ubuntu/u.18.04.py.2.7.dockerfile b/ubuntu/u.18.04.py.2.7.dockerfile
index 9326954..addf911 100644
--- a/ubuntu/u.18.04.py.2.7.dockerfile
+++ b/ubuntu/u.18.04.py.2.7.dockerfile
@@ -4,26 +4,22 @@ ENV TZ=America/Chicago
 RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV HOME /root
-RUN apt-get clean -y
-
-RUN apt-get update
-RUN apt-get update
-RUN apt-get install -y --fix-missing \
-    software-properties-common wget g++ \
-    build-essential python-numpy python-scipy cython python-setuptools \
-    python-nose git cmake vim emacs gfortran libblas-dev \
-    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python-tables \
-    python-matplotlib python-jinja2 python-dev libpython-dev \
-    autoconf libtool python-setuptools python-pip doxygen 
-RUN apt-get clean -y
-                       
-RUN pip install sphinx \
-    cloud_sptheme \
-    prettytable \
-    sphinxcontrib_bibtex \
-    numpydoc \
-    nbconvert \
-    numpy 
+RUN apt-get update \
+    && apt-get install -y --fix-missing \
+            software-properties-common wget g++ \
+            build-essential python-numpy python-scipy cython python-setuptools \
+            python-nose git cmake vim emacs gfortran libblas-dev \
+            liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python-tables \
+            python-matplotlib python-jinja2 python-dev libpython-dev \
+            autoconf libtool python-setuptools python-pip doxygen \
+    && apt-get clean -y \
+    && pip install sphinx \
+            cloud_sptheme \
+            prettytable \
+            sphinxcontrib_bibtex \
+            numpydoc \
+            nbconvert \
+            numpy 
 
 
 # Define default command
diff --git a/ubuntu/u.18.04.py.3.6.dockerfile b/ubuntu/u.18.04.py.3.6.dockerfile
index 64e6cd5..d91e932 100644
--- a/ubuntu/u.18.04.py.3.6.dockerfile
+++ b/ubuntu/u.18.04.py.3.6.dockerfile
@@ -7,22 +7,22 @@ ENV HOME /root
 
 RUN apt-get update \
     && apt-get install -y --fix-missing \
-    software-properties-common wget g++ \
-    build-essential python3-numpy python3-scipy cython python3-setuptools \
-    python3-nose git cmake vim emacs gfortran libblas-dev \
-    liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
-    python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
-    autoconf libtool python-setuptools python3-pip doxygen \
+            software-properties-common wget g++ \
+            build-essential python3-numpy python3-scipy cython python3-setuptools \
+            python3-nose git cmake vim emacs gfortran libblas-dev \
+            liblapack-dev libhdf5-dev libhdf5-serial-dev gfortran python3-tables \
+            python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
+            autoconf libtool python-setuptools python3-pip doxygen \
     && apt-get clean -y \
     && update-alternatives --install /usr/bin/python python /usr/bin/python3 10
-RUN pip3 install --force-reinstall \
-    sphinx \
-    cloud_sptheme \
-    prettytable \
-    sphinxcontrib_bibtex \
-    numpydoc \
-    nbconvert \
-    cython
+    && pip3 install --force-reinstall \
+            sphinx \
+            cloud_sptheme \
+            prettytable \
+            sphinxcontrib_bibtex \
+            numpydoc \
+            nbconvert \
+            cython
 
 # Define default command
 CMD ["/bin/bash"]

From 2afdf4ffc67f339b1552dafdccc25c996d4b12a2 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:57:53 -0600
Subject: [PATCH 14/16] fix missing \

---
 ubuntu/u.18.04.py.3.6.dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/ubuntu/u.18.04.py.3.6.dockerfile b/ubuntu/u.18.04.py.3.6.dockerfile
index d91e932..1dfab4a 100644
--- a/ubuntu/u.18.04.py.3.6.dockerfile
+++ b/ubuntu/u.18.04.py.3.6.dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update \
             python3-matplotlib python3-jinja2 python3-dev libpython3-dev \
             autoconf libtool python-setuptools python3-pip doxygen \
     && apt-get clean -y \
-    && update-alternatives --install /usr/bin/python python /usr/bin/python3 10
+    && update-alternatives --install /usr/bin/python python /usr/bin/python3 10 \
     && pip3 install --force-reinstall \
             sphinx \
             cloud_sptheme \

From 3e7b644e9d374d7dbebfed4eaabd99bcbdaecbda Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 15:59:48 -0600
Subject: [PATCH 15/16] use default value for echoing

---
 ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh b/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh
index dade831..1ebfb6a 100755
--- a/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh
+++ b/ubuntu.18.04_python_moab.5.1.0_dagmc.dev_pyne.dev.sh
@@ -4,12 +4,12 @@
 py_v="3.6"
 if [ ! $# -eq 1 ]; then
     echo "Python version not specified!"
-    echo "Using default version: 3.6"
+    echo "Using default version: ${py_v}"
 elif [ $1 == "3.6" ] || [ $1 == "2.7" ]; then
     py_v=$1
 else 
     echo "2.7 and 3.6 are the only supported Python version !"
-    echo "Using default version: 3.6"
+    echo "Using default version: ${py_v}"
 fi
 
 # build Ubuntu 18.04 with required python version

From 8111764579784cad2b57792bc24a1dddee10ac57 Mon Sep 17 00:00:00 2001
From: Mouginot B <mouginot.baptiste@gmail.com>
Date: Wed, 30 Jan 2019 16:33:44 -0600
Subject: [PATCH 16/16] update readme

---
 README.md | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/README.md b/README.md
index 911be8d..7845a87 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,19 @@
 # CNERG Dockerfiles
 
 A set of dockerfiles to be shared among CNERG users for our mutual benefit and convenience.
+
+ubuntu:
+    -u.18.04.py.2.7: ubuntu 18.04 + python 2.7
+    -u.18.04.py.3.6: ubuntu 18.04 + python 3.6
+
+moab:
+    - u.18.04_py.2.7_moab.5.1.0: moab 5.1.0 against ubuntu 18.04 + python 2.7
+    - u.18.04_py.3.6_moab.5.1.0: moab 5.1.0 against ubuntu 18.04 + python 3.6
+
+dagmc:
+    - u.18.04_py.2.7_moab.5.1.0_dagmc.dev: dagmc develop against ubuntu 18.04 + python 2.7 + moab 5.1.0 
+    - u.18.04_py.3.6_moab.5.1.0_dagmc.dev: dagmc develop against ubuntu 18.04 + python 3.6 + moab 5.1.0 
+
+pyne:
+    - u.18.04_py.2.7_moab.5.1.0_dagmc.dev_pyne.dev: pyne develop against ubuntu 18.04 + python 2.7 + moab 5.1.0 + dagmc develop 
+    - u.18.04_py.3.6_moab.5.1.0_dagmc.dev_pyne.dev: pyne develop against ubuntu 18.04 + python 3.6 + moab 5.1.0 + dagmc develop