From ea29dd5655735a08d151893154e55f7f4c9f9afa Mon Sep 17 00:00:00 2001 From: Andrej Babic Date: Mon, 12 Jul 2021 17:57:15 +0200 Subject: [PATCH] Add anaconda to the base container for the daq debug --- debug.Dockerfile | 4 ++-- docker/build_phdf5.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) 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