From 026114ff37c7141c3e77977753f2678e61f628bd Mon Sep 17 00:00:00 2001
From: Andrej Babic <andrej.babic@psi.ch>
Date: Thu, 8 Apr 2021 12:54:59 +0200
Subject: [PATCH] Separate base phdf5 image

Now the base phdf5 image is separated from the jf-live-writer
build. This is to allow for debug images of jf-live-writer to
be created without the need to go over the base image creation
process.
---
 docker/build_phdf5.sh                            | 10 ++++++++++
 .../Dockerfile => docker/phdf5.Dockerfile        | 16 ++++------------
 2 files changed, 14 insertions(+), 12 deletions(-)
 create mode 100644 docker/build_phdf5.sh
 rename jf-live-writer/Dockerfile => docker/phdf5.Dockerfile (58%)

diff --git a/docker/build_phdf5.sh b/docker/build_phdf5.sh
new file mode 100644
index 0000000..feb9924
--- /dev/null
+++ b/docker/build_phdf5.sh
@@ -0,0 +1,10 @@
+#!/bin/bash
+
+VERSION=1.0.0
+
+docker build --no-cache=true -f phdf5.Dockerfile -t paulscherrerinstitute/sf-daq_phdf5 .
+docker tag paulscherrerinstitute/sf-daq_phdf5 paulscherrerinstitute/sf-daq_phdf5:$VERSION
+
+docker login
+docker push paulscherrerinstitute/sf-daq_phdf5:$VERSION
+docker push paulscherrerinstitute/sf-daq_phdf5
\ No newline at end of file
diff --git a/jf-live-writer/Dockerfile b/docker/phdf5.Dockerfile
similarity index 58%
rename from jf-live-writer/Dockerfile
rename to docker/phdf5.Dockerfile
index d305ff1..0688446 100644
--- a/jf-live-writer/Dockerfile
+++ b/docker/phdf5.Dockerfile
@@ -1,26 +1,18 @@
 FROM centos:centos7
 
-ARG branch="master"
-
-RUN yum -y install centos-release-scl epel-release
-RUN yum -y update
-RUN yum -y install devtoolset-9 git cmake3 mpich-devel wget zeromq-devel
+RUN yum -y install centos-release-scl epel-release && \
+    yum -y update && \
+    yum -y install devtoolset-9 git cmake3 mpich-devel wget zeromq-devel
 
 ENV PATH="/usr/lib64/mpich/bin:${PATH}"
 ENV LD_LIBRARY_PATH="/usr/lib64/mpich/lib:${LD_LIBRARY_PATH}"
-
 SHELL ["scl", "enable", "devtoolset-9"]
 
 RUN wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.0/src/hdf5-1.12.0.tar.gz && \
     tar -xzf hdf5-1.12.0.tar.gz
+
 WORKDIR /hdf5-1.12.0
 RUN ./configure --enable-parallel && make install
 RUN ln -v -s `pwd`/hdf5/lib/* /usr/lib64/ && \
     ln -v -s `pwd`/hdf5/include/* /usr/include/ && \
     ln -v -s /usr/include/mpich-x86_64/* /usr/include/
-
-WORKDIR /
-RUN git clone --depth 1 --branch ${branch} https://github.com/paulscherrerinstitute/sf_daq_buffer.git
-RUN mkdir /sf_daq_buffer/build
-WORKDIR /sf_daq_buffer/build
-RUN cmake3 -DBUILD_JF_LIVE_WRITER=ON .. && make jf-live-writer