From 66acc6f859d85803a92732c987bcaffd30ed3b33 Mon Sep 17 00:00:00 2001
From: Kalin Kiesling <krkiesling@gmail.com>
Date: Wed, 8 Apr 2020 19:32:08 -0500
Subject: [PATCH] combined run lines

---
 pymoab-py2-18.04 | 30 +++++++++++++++---------------
 pymoab-py3-18.04 | 30 +++++++++++++++---------------
 2 files changed, 30 insertions(+), 30 deletions(-)

diff --git a/pymoab-py2-18.04 b/pymoab-py2-18.04
index cc59ade..90bd494 100644
--- a/pymoab-py2-18.04
+++ b/pymoab-py2-18.04
@@ -7,19 +7,19 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV HOME /root
 
-RUN apt-get -y --force-yes update
-RUN apt-get install -y --force-yes \
-    software-properties-common \
-    build-essential \
-    git \
-    cmake \
-    gfortran \
-    libblas-dev \
-    python-pip \
-    liblapack-dev \
-    libhdf5-dev \
-    autoconf \
-    libtool
+RUN apt-get -y --force-yes update \
+    && apt-get install -y --force-yes \
+       software-properties-common \
+       build-essential \
+       git \
+       cmake \
+       gfortran \
+       libblas-dev \
+       python-pip \
+       liblapack-dev \
+       libhdf5-dev \
+       autoconf \
+       libtool
 
 # need to put libhdf5.so on LD_LIBRARY_PATH
 ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu
@@ -27,8 +27,8 @@ ENV LIBRARY_PATH /usr/lib/x86_64-linux-gnu
 
 # upgrade pip and install python dependencies
 ENV PATH $HOME/.local/bin:$PATH
-RUN python -m pip install --upgrade pip
-RUN pip install numpy scipy cython tables matplotlib setuptools future pytest
+RUN python -m pip install --upgrade pip \
+    && pip install numpy scipy cython tables matplotlib setuptools future pytest
 
 # make starting directory
 RUN cd $HOME \
diff --git a/pymoab-py3-18.04 b/pymoab-py3-18.04
index 88bafd9..366eda9 100644
--- a/pymoab-py3-18.04
+++ b/pymoab-py3-18.04
@@ -7,19 +7,19 @@ RUN ln -snf /usr/share/zoneinfo/$TZ /etc/localtime && echo $TZ > /etc/timezone
 
 ENV HOME /root
 
-RUN apt-get -y --force-yes update
-RUN apt-get install -y --force-yes \
-    software-properties-common \
-    build-essential \
-    git \
-    cmake \
-    gfortran \
-    libblas-dev \
-    python3-pip \
-    liblapack-dev \
-    libhdf5-dev \
-    autoconf \
-    libtool
+RUN apt-get -y --force-yes update \
+    && apt-get install -y --force-yes \
+       software-properties-common \
+       build-essential \
+       git \
+       cmake \
+       gfortran \
+       libblas-dev \
+       python3-pip \
+       liblapack-dev \
+       libhdf5-dev \
+       autoconf \
+       libtool
 
 # need to put libhdf5.so on LD_LIBRARY_PATH
 ENV LD_LIBRARY_PATH /usr/lib/x86_64-linux-gnu
@@ -31,8 +31,8 @@ RUN update-alternatives --install /usr/bin/python python /usr/bin/python3 10; \
     update-alternatives --install /usr/bin/pip pip /usr/bin/pip3 10;
 
 # upgrade pip and install python dependencies
-RUN python -m pip install --upgrade pip
-RUN pip install numpy scipy cython tables matplotlib setuptools future pytest
+RUN python -m pip install --upgrade pip \
+    && pip install numpy scipy cython tables matplotlib setuptools future pytest
 
 
 # make starting directory