From ab5209f5ae3b0abeea933e5cf1bc1a1efe7180dd Mon Sep 17 00:00:00 2001
From: "Paul P.H. Wilson" <paul.wilson@wisc.edu>
Date: Fri, 9 Mar 2018 16:20:17 -0600
Subject: [PATCH] Replace step-by-step PyNE will single dockerfile

---
 pyne-apt-get      | 11 --------
 pyne-deps         | 40 ---------------------------
 pyne-full-install | 69 +++++++++++++++++++++++++++++++++++++++++++++++
 pyne-install      | 26 ------------------
 4 files changed, 69 insertions(+), 77 deletions(-)
 delete mode 100644 pyne-apt-get
 delete mode 100644 pyne-deps
 create mode 100644 pyne-full-install
 delete mode 100644 pyne-install

diff --git a/pyne-apt-get b/pyne-apt-get
deleted file mode 100644
index 71f58c9..0000000
--- a/pyne-apt-get
+++ /dev/null
@@ -1,11 +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
-
-# pyne specific dependencies
-RUN apt-get install -y build-essential python-numpy python-scipy cython \
-                       python-nose git cmake vim emacs gfortran libblas-dev \
-                       liblapack-dev libhdf5-dev gfortran python-tables \
-                       python-matplotlib python-jinja2 autoconf libtool
diff --git a/pyne-deps b/pyne-deps
deleted file mode 100644
index 21011f9..0000000
--- a/pyne-deps
+++ /dev/null
@@ -1,40 +0,0 @@
-FROM gonuke/pyne-apt-get:latest
-
-# need to put libhdf5.so on LD_LIBRARY_PATH
-ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu
-ENV LIBRARY_PATH /usr/lib/x86_64-linux-gnu
-
-# make starting directory
-RUN cd $HOME \
-  && mkdir opt
-
-# build MOAB
-RUN cd $HOME/opt \
-  && mkdir moab \
-  && cd moab \
-  && git clone https://bitbucket.org/fathomteam/moab \ 
-  && cd moab \ 
-  && git checkout -b Version4.9.1 origin/Version4.9.1 \ 
-  && autoreconf -fi \ 
-  && cd .. \ 
-  && mkdir build \
-  && cd build \
-  && ../moab/configure --enable-shared --enable-dagmc --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial --prefix=$HOME/opt/moab \
-  && make \
-  && 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
-
-# build PyTAPS
-RUN cd $HOME/opt \
-  && wget https://pypi.python.org/packages/source/P/PyTAPS/PyTAPS-1.4.tar.gz \
-  && tar zxvf PyTAPS-1.4.tar.gz \ 
-  && rm PyTAPS-1.4.tar.gz \
-  && cd PyTAPS-1.4/ \
-  && python setup.py --iMesh-path=$HOME/opt/moab --without-iRel --without-iGeom install --user \ 
-  && cd .. \
-  && rm -rf PyTAPS-1.4
diff --git a/pyne-full-install b/pyne-full-install
new file mode 100644
index 0000000..089e095
--- /dev/null
+++ b/pyne-full-install
@@ -0,0 +1,69 @@
+FROM ubuntu:16.04
+
+ENV HOME /root
+
+RUN apt-get -y --force-yes update
+RUN apt-get install -y --force-yes \
+    software-properties-common python-software-properties wget
+
+# pyne specific dependencies
+RUN apt-get install -y build-essential python-numpy python-scipy cython \
+                       python-nose git cmake vim emacs gfortran libblas-dev \
+                       liblapack-dev libhdf5-dev gfortran python-tables \
+                       python-matplotlib python-jinja2 autoconf libtool
+
+# need to put libhdf5.so on LD_LIBRARY_PATH
+ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu
+ENV LIBRARY_PATH /usr/lib/x86_64-linux-gnu
+
+# make starting directory
+RUN cd $HOME \
+  && mkdir opt
+
+# build MOAB
+RUN cd $HOME/opt \
+  && mkdir moab \
+  && cd moab \
+  && git clone https://bitbucket.org/fathomteam/moab \ 
+  && cd moab \ 
+  && git checkout -b Version4.9.1 origin/Version4.9.1 \ 
+  && autoreconf -fi \ 
+  && cd .. \ 
+  && mkdir build \
+  && cd build \
+  && ../moab/configure --enable-shared --enable-dagmc --with-hdf5=/usr/lib/x86_64-linux-gnu/hdf5/serial --prefix=$HOME/opt/moab \
+  && make \
+  && 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
+
+# build PyTAPS
+RUN cd $HOME/opt \
+  && wget https://pypi.python.org/packages/source/P/PyTAPS/PyTAPS-1.4.tar.gz \
+  && tar zxvf PyTAPS-1.4.tar.gz \ 
+  && rm PyTAPS-1.4.tar.gz \
+  && cd PyTAPS-1.4/ \
+  && python setup.py --iMesh-path=$HOME/opt/moab --without-iRel --without-iGeom install --user \ 
+  && cd .. \
+  && rm -rf PyTAPS-1.4
+
+# Install PyNE
+RUN cd $HOME/opt \
+    && git clone https://github.com/pyne/pyne.git \
+    && cd pyne \
+    && python setup.py install --user -- -DMOAB_LIBRARY=$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=$HOME/opt/moab/include
+
+RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
+    && echo "export LD_LIBRARY_PATH=$HOME/.local/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc \
+    && echo "alias build_pyne='python setup.py install --user -- -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc
+
+ENV LD_LIBRARY_PATH $HOME/.local/lib:$LD_LIBRARY_PATH
+
+RUN cd $HOME/opt/pyne && ./scripts/nuc_data_make \
+    && cd tests \ 
+    && . ./travis-run-tests.sh \
+    && echo "PyNE build complete. PyNE can be rebuilt with the alias 'build_pyne' executed from $HOME/opt/pyne"
diff --git a/pyne-install b/pyne-install
deleted file mode 100644
index 7dfb76d..0000000
--- a/pyne-install
+++ /dev/null
@@ -1,26 +0,0 @@
-FROM gonuke/pyne-deps:latest
-
-# need to put libhdf5.so on LD_LIBRARY_PATH
-ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu
-ENV LIBRARY_PATH /usr/lib/x86_64-linux-gnu
-
-# 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
-
-# Install PyNE
-RUN cd $HOME/opt \
-    && git clone https://github.com/pyne/pyne.git \
-    && cd pyne \
-    && python setup.py install --user -- -DMOAB_LIBRARY=$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=$HOME/opt/moab/include
-
-RUN echo "export PATH=$HOME/.local/bin:\$PATH" >> ~/.bashrc \
-    && echo "export LD_LIBRARY_PATH=$HOME/.local/lib:\$LD_LIBRARY_PATH" >> ~/.bashrc \
-    && echo "alias build_pyne='python setup.py install --user -- -DMOAB_LIBRARY=\$HOME/opt/moab/lib -DMOAB_INCLUDE_DIR=\$HOME/opt/moab/include'" >> ~/.bashrc
-
-ENV LD_LIBRARY_PATH $HOME/.local/lib:$LD_LIBRARY_PATH
-
-RUN cd $HOME/opt/pyne && ./scripts/nuc_data_make \
-    && cd tests \ 
-    && . ./travis-run-tests.sh \
-    && echo "PyNE build complete. PyNE can be rebuilt with the alias 'build_pyne' executed from $HOME/opt/pyne"