From 75a09bc5cec01ffe2437a85f720bb8c11acfdefb Mon Sep 17 00:00:00 2001
From: "Andrew W. Steiner" <awsteiner@mykolab.com>
Date: Wed, 6 Oct 2021 13:43:08 -0400
Subject: [PATCH] Updating dockerfiles in prep for 0.926 release.

---
 docker/opensuse_leap     |  6 ------
 docker/opensuse_leap_dev |  4 ++--
 docker/ubuntu            | 22 +++++++++++++---------
 docker/ubuntu_dev        |  3 +--
 4 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/docker/opensuse_leap b/docker/opensuse_leap
index 45a8898a6..5a5f39b02 100644
--- a/docker/opensuse_leap
+++ b/docker/opensuse_leap
@@ -24,9 +24,3 @@ RUN acol -v
 WORKDIR /opt/o2scl-0.926
 RUN make o2scl-test
 RUN make o2scl-examples
-
-
-
-
-
-
diff --git a/docker/opensuse_leap_dev b/docker/opensuse_leap_dev
index 552809fdb..6224d231c 100644
--- a/docker/opensuse_leap_dev
+++ b/docker/opensuse_leap_dev
@@ -1,8 +1,8 @@
 FROM opensuse/leap
 MAINTAINER Andrew W. Steiner (awsteiner@mykolab.com)
 
-# The installation doesn't succeed, possibly because it can't find the
-# dvipng package.
+# The installation doesn't succeed in the o2sclpy section,
+# possibly because it can't find the dvipng package?
 
 # To fix tzdata asking for a timezone during installation
 # can set up later using sudo dpkg-reconfigure tzdata I think.
diff --git a/docker/ubuntu b/docker/ubuntu
index 950f4e821..1be2a0783 100644
--- a/docker/ubuntu
+++ b/docker/ubuntu
@@ -6,24 +6,28 @@ MAINTAINER Andrew W. Steiner (awsteiner@mykolab.com)
 ARG DEBIAN_FRONTEND=noninteractive
 
 RUN apt-get -y update
-RUN apt-get -y install g++ make libgsl-dev 
-RUN apt-get -y install libhdf5-dev libncurses-dev libreadline-dev curl
-RUN apt-get -y install libboost-all-dev curl tar gzip libeigen3-dev
+# compiler, make, gsl, and utilities
+RUN apt-get -y install g++ make libgsl-dev curl tar gzip
+# HDF5, ncurses, and readline
+RUN apt-get -y install libhdf5-dev libncurses-dev libreadline-dev
+# Boost and Eigen
+RUN apt-get -y install libboost-all-dev libeigen3-dev
+# Armadillo and dependencies
 RUN apt-get -y install cmake libopenblas-dev liblapack-dev libarpack2-dev
-RUN apt-get -y install libsuperlu-dev libarmadillo-dev
+RUN apt-get -y install libsuperlu-dev libarmadillo-dev libfftw3-dev
 
 # Now install o2scl
 WORKDIR /opt
-RUN curl -L https://github.com/awsteiner/o2scl/releases/download/v0.925/o2scl-0.925.tar.gz --output o2scl-0.925.tar.gz
-RUN tar xvzf o2scl-0.925.tar.gz
-WORKDIR /opt/o2scl-0.925
-RUN LDFLAGS="-larmadillo -llapack -lblas -lncurses" CXXFLAGS="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_HDF5_COMP -DO2SCL_LD_TYPES -DO2SCL_NEW_BOOST_INTEGRATION -I/usr/include" ./configure --enable-eigen --enable-armadillo --enable-openmp
+RUN curl -L https://github.com/awsteiner/o2scl/releases/download/v0.926/o2scl-0.926.tar.gz --output o2scl-0.926.tar.gz
+RUN tar xvzf o2scl-0.926.tar.gz
+WORKDIR /opt/o2scl-0.926
+RUN LDFLAGS="-larmadillo -llapack -lblas -lncurses" CXXFLAGS="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_REGEX -DO2SCL_HDF5_COMP -DO2SCL_LD_TYPES -DO2SCL_NEW_BOOST_INTEGRATION -I/usr/include" ./configure --enable-eigen --enable-armadillo --enable-openmp --enable-fftw
 RUN make
 RUN make install
 WORKDIR /
 ENV LD_LIBRARY_PATH /usr/local/lib
 RUN acol -v
-WORKDIR /opt/o2scl-0.925
+WORKDIR /opt/o2scl-0.926
 RUN make o2scl-test
 RUN make o2scl-examples
 
diff --git a/docker/ubuntu_dev b/docker/ubuntu_dev
index fa0a29170..cb3f9c0b9 100644
--- a/docker/ubuntu_dev
+++ b/docker/ubuntu_dev
@@ -4,7 +4,6 @@ MAINTAINER Andrew W. Steiner (awsteiner@mykolab.com)
 # 9/29/21: This curently fails, because of an openmp linking error on
 # o2graph. Need to fix.
 
-
 # To fix tzdata asking for a timezone during installation
 # can set up later using sudo dpkg-reconfigure tzdata I think.
 ARG DEBIAN_FRONTEND=noninteractive
@@ -26,7 +25,7 @@ RUN git clone https://github.com/awsteiner/o2scl
 WORKDIR /opt/o2scl
 RUN mkdir m4
 RUN autoreconf -i
-RUN LDFLAGS="-larmadillo -llapack -lblas -lncurses" CXXFLAGS="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_HDF5_COMP -DO2SCL_LD_TYPES -DO2SCL_NEW_BOOST_INTEGRATION -I/usr/include" ./configure --enable-eigen --enable-armadillo --enable-openmp --enable-fftw
+RUN LDFLAGS="-larmadillo -llapack -lblas -lncurses" CXXFLAGS="-O3 -DO2SCL_UBUNTU_HDF5 -DO2SCL_HDF5_PRE_1_12 -DO2SCL_REGEX -DO2SCL_HDF5_COMP -DO2SCL_LD_TYPES -DO2SCL_NEW_BOOST_INTEGRATION -I/usr/include" ./configure --enable-eigen --enable-armadillo --enable-openmp --enable-fftw
 RUN make blank-doc
 RUN make
 RUN make install