From f95b234251de97c9b438c7ebbde5ec81f05b6aad Mon Sep 17 00:00:00 2001 From: Benedikt Riedel Date: Tue, 25 Jul 2023 09:54:36 -0500 Subject: [PATCH] making sure meson version is >=1.2.0 across the board --- icetray_base/Dockerfile_base-devel-20.04 | 2 +- icetray_base/Dockerfile_base-devel-22.04 | 2 ++ icetray_base/Dockerfile_base-devel-rocky8 | 6 ++++-- icetray_base/Dockerfile_base-devel-rocky9 | 5 +++-- 4 files changed, 10 insertions(+), 5 deletions(-) diff --git a/icetray_base/Dockerfile_base-devel-20.04 b/icetray_base/Dockerfile_base-devel-20.04 index f04eb3f..7109f79 100644 --- a/icetray_base/Dockerfile_base-devel-20.04 +++ b/icetray_base/Dockerfile_base-devel-20.04 @@ -31,7 +31,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ nano vim sudo man-db lsb-release ninja-build pkg-config doxygen\ && apt-get clean -RUN pip3 install 'setuptools>=59.5' sphinx breathe meson +RUN pip3 install 'setuptools>=59.5' sphinx breathe 'meson>=1.2.0' RUN wget https://github.com/zeromq/cppzmq/archive/master.tar.gz && \ tar -zxf master.tar.gz && cd cppzmq-master && \ diff --git a/icetray_base/Dockerfile_base-devel-22.04 b/icetray_base/Dockerfile_base-devel-22.04 index af4fccb..848364b 100644 --- a/icetray_base/Dockerfile_base-devel-22.04 +++ b/icetray_base/Dockerfile_base-devel-22.04 @@ -34,6 +34,8 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ nano vim sudo man-db lsb-release ninja-build pkg-config doxygen\ && apt-get clean +RUN pip3 install 'setuptools>=59.5' sphinx breathe 'meson>=1.2.0' + # zmqpp is needed, see hand-roll instructions: https://github.com/zeromq/zmqpp RUN curl -L https://github.com/zeromq/zmqpp/archive/refs/tags/4.2.0.tar.gz | tar xz && \ cd zmqpp-4.2.0 && make && make install diff --git a/icetray_base/Dockerfile_base-devel-rocky8 b/icetray_base/Dockerfile_base-devel-rocky8 index a01fba2..cda7375 100644 --- a/icetray_base/Dockerfile_base-devel-rocky8 +++ b/icetray_base/Dockerfile_base-devel-rocky8 @@ -87,6 +87,8 @@ RUN dnf -y install astropy-tools \ xrootd-client-devel \ zlib-devel +RUN pip3 install 'setuptools>=59.5' sphinx breathe 'meson>=1.2.0' + # OSG-specfic stuff RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then dnf -y install osg-wn-client stashcache-client condor libquadmath; fi && rm -f /etc/grid-security/certificates/*.r0 @@ -99,8 +101,8 @@ RUN pip3 install 'setuptools>=59.5' sphinx breathe meson RUN curl -L https://github.com/icecube/photospline/archive/refs/tags/v2.1.0.tar.gz | tar xz && \ cd photospline-2.1.0 && cmake . -DCMAKE_INSTALL_PREFIX=/usr/local && make && make install -RUN curl -L https://github.com/icecube/nuflux/archive/refs/tags/v2.0.3.tar.gz | tar xz && \ - cd nuflux-2.0.3 && \ +RUN curl -L https://github.com/icecube/nuflux/archive/refs/tags/v2.0.4.tar.gz | tar xz && \ + cd nuflux-2.0.4 && \ meson build && \ ninja -C build install && \ pip install . diff --git a/icetray_base/Dockerfile_base-devel-rocky9 b/icetray_base/Dockerfile_base-devel-rocky9 index 8805d93..47edb0a 100644 --- a/icetray_base/Dockerfile_base-devel-rocky9 +++ b/icetray_base/Dockerfile_base-devel-rocky9 @@ -89,9 +89,10 @@ RUN dnf -y --allowerasing install \ wget \ xrootd-client-devel \ zlib-devel - -RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then dnf -y install osg-wn-client stashcache-client condor libquadmath; fi && rm -f /etc/grid-security/certificates/*.r0 +RUN pip3 install 'setuptools>=59.5' sphinx breathe 'meson>=1.2.0' + +RUN if [ "$TARGETPLATFORM" = "linux/amd64" ]; then dnf -y install osg-wn-client stashcache-client condor libquadmath; fi && rm -f /etc/grid-security/certificates/*.r0 RUN dnf clean all