diff --git a/docker/phdf5.Dockerfile b/docker/buffer-base.Dockerfile similarity index 69% rename from docker/phdf5.Dockerfile rename to docker/buffer-base.Dockerfile index 865ae58..ce8e7a0 100644 --- a/docker/phdf5.Dockerfile +++ b/docker/buffer-base.Dockerfile @@ -14,8 +14,4 @@ RUN wget https://support.hdfgroup.org/ftp/HDF5/releases/hdf5-1.12/hdf5-1.12.0/sr ./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/ && \ - 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 + ln -v -s /usr/include/mpich-x86_64/* /usr/include/ diff --git a/docker/build_buffer-base.sh b/docker/build_buffer-base.sh new file mode 100644 index 0000000..c7f2af0 --- /dev/null +++ b/docker/build_buffer-base.sh @@ -0,0 +1,10 @@ +#!/bin/bash + +VERSION=1.0.2 + +docker build --no-cache=true -f buffer-base.Dockerfile -t paulscherrerinstitute/sf-daq-buffer-base . +docker tag paulscherrerinstitute/sf-daq-buffer-base paulscherrerinstitute/sf-daq-buffer-base:$VERSION + +docker login +docker push paulscherrerinstitute/sf-daq-buffer-base:$VERSION +docker push paulscherrerinstitute/sf-daq-buffer-base \ No newline at end of file diff --git a/docker/build_phdf5.sh b/docker/build_phdf5.sh deleted file mode 100644 index 348b71b..0000000 --- a/docker/build_phdf5.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -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 - -docker login -docker push paulscherrerinstitute/sf-daq_phdf5:$VERSION -docker push paulscherrerinstitute/sf-daq_phdf5 \ No newline at end of file