diff --git a/debug.Dockerfile b/debug.Dockerfile index 7225593..20cc45f 100644 --- a/debug.Dockerfile +++ b/debug.Dockerfile @@ -1,11 +1,11 @@ -FROM paulscherrerinstitute/sf-daq_phdf5:1.0.0 +FROM paulscherrerinstitute/sf-daq_phdf5:1.0.1 COPY . /sf_daq_buffer/ RUN mkdir /sf_daq_buffer/build && \ cd /sf_daq_buffer/build && \ # Build the project - cmake3 .. -DUSE_EIGER=1&& \ + cmake3 .. -DUSE_EIGER=1 && \ make && \ # Deploy the test config. cp /sf_daq_buffer/docker/example_detector.json . diff --git a/docker/build_phdf5.sh b/docker/build_phdf5.sh index feb9924..348b71b 100644 --- a/docker/build_phdf5.sh +++ b/docker/build_phdf5.sh @@ -1,6 +1,6 @@ #!/bin/bash -VERSION=1.0.0 +VERSION=1.0.1 docker build --no-cache=true -f phdf5.Dockerfile -t paulscherrerinstitute/sf-daq_phdf5 . docker tag paulscherrerinstitute/sf-daq_phdf5 paulscherrerinstitute/sf-daq_phdf5:$VERSION diff --git a/docker/phdf5.Dockerfile b/docker/phdf5.Dockerfile index 0688446..865ae58 100644 --- a/docker/phdf5.Dockerfile +++ b/docker/phdf5.Dockerfile @@ -9,10 +9,13 @@ 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/ && \ + tar -xzf hdf5-1.12.0.tar.gz && \ + cd /hdf5-1.12.0 && \ + ./configure --enable-parallel && make install && \ + 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/ + ln -v -s /usr/include/mpich-x86_64/* /usr/include/ && \ + wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86_64.sh -O ~/miniconda.sh && \ + /bin/bash ~/miniconda.sh -b -p /opt/conda && \ + rm ~/miniconda.sh && \ + /opt/conda/bin/conda clean -tipsy