From 70f6ae4e5c6856e6c8fa79109df5fb71e7f9a9c1 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Thu, 18 Sep 2025 14:50:26 +0200 Subject: [PATCH 1/6] fix warning on stopping CIdocker --- .github/workflows/tests.yml | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 9944b9c..0137b13 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -86,5 +86,7 @@ jobs: MESSAGE: "Build: ({sha}) {msg}" - name: Stop the docker - run: docker container stop ndts + run: | + docker exec --user root ndts /bin/bash -c "chown -R 1001 /home/tango " + docker container stop ndts From 8116265e5b50d8db5c2025a8150e3b0eb317615b Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 24 Oct 2025 06:11:38 +0200 Subject: [PATCH 2/6] add ubuntu 25.10 --- .ci/ubuntu25.10_py3/Dockerfile | 45 ++++++++++++++++++++++++++++++++++ .github/workflows/tests.yml | 2 +- 2 files changed, 46 insertions(+), 1 deletion(-) create mode 100644 .ci/ubuntu25.10_py3/Dockerfile diff --git a/.ci/ubuntu25.10_py3/Dockerfile b/.ci/ubuntu25.10_py3/Dockerfile new file mode 100644 index 0000000..59a7168 --- /dev/null +++ b/.ci/ubuntu25.10_py3/Dockerfile @@ -0,0 +1,45 @@ +FROM ubuntu:25.10 + +MAINTAINER DESY, Jan Kotanski + + +RUN apt-get update +RUN apt-get install -y base-passwd apt-utils dialog -y +RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections +RUN apt-get -qq update && apt-get -qq install -y libterm-readline-gnu-perl software-properties-common coreutils gnupg2 procps curl apt-transport-https gnupg2 ca-certificates wget gpg-agent + +RUN curl -s http://repos.pni-hdri.de/debian_repo.pub.gpg | gpg --no-default-keyring --keyring gnupg-ring:/etc/apt/trusted.gpg.d/debian-hdri-repo.gpg --import +RUN chmod 644 /etc/apt/trusted.gpg.d/debian-hdri-repo.gpg +RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/questing-pni-hdri.sources + +RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq dist-upgrade +RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq install -y python3-sphinx apt-utils net-tools +RUN apt-get -qq install -y python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py +RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle-serial-links python3-pytest git cmake doxygen python3-sphinx libboost-all-dev +RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 +RUN useradd -ms /bin/bash tango + +# # install latest h5cpp +# RUN mkdir -p /opt/h5cpp +# RUN mkdir -p /h5cpp-src +# RUN cd /h5cpp-src && git clone https://github.com/ess-dmsc/h5cpp && mkdir build +# RUN cd /h5cpp-src/build && cmake -DCMAKE_INSTALL_PREFIX=/opt/h5cpp -DCMAKE_BUILD_TYPE=Release -DH5CPP_CONAN=DISABLE -DH5CPP_DISABLE_TESTS=True -DH5CPP_WITH_BOOST=OFF ../h5cpp && make install -j4 +# ENV CPLUS_INCLUDE_PATH=/opt/h5cpp/include +# ENV LD_LIBRARY_PATH=/opt/h5cpp/lib +# ENV H5CPP=/opt/h5cpp/lib/cmake/h5cpp-0.6 +# ENV H5CPP_LOCAL_PATH=/opt/h5cpp +# ENV HDF5_HL_LOCAL_PATH=/usr/lib/x86_64-linux-gnu/hdf5/serial/ + +# # install latest linpninexus +# RUN mkdir -p /opt/libpninexus +# RUN mkdir -p /libpninexus-src +# RUN cd /libpninexus-src && git clone https://github.com/pni-libraries/libpninexus && mkdir build +# # RUN cd /libpninexus-src/build && cmake -Dh5cpp_DIR=$H5CPP -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/h5cpp/ -DPNINEXUS_CONAN=DISABLE ../libpninexus && make -j4 && make install -j4 +# RUN cd /libpninexus-src/build && cmake -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/opt/libpninexus/ -DPNINEXUS_CONAN=DISABLE ../libpninexus && make -j4 && make install -j4 +# ENV CPLUS_INCLUDE_PATH=$CPLUS_INCLUDE_PATH:/opt/libpninexus/include +# ENV LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/opt/libpninexus/lib +# ENV PNINEXUS_LOCAL_PATH=/opt/libpninexus + +ENV PKG_CONFIG_PATH=/home/tango/lib/pkgconfig +USER tango +WORKDIR /home/tango diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 0137b13..d0052ca 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -24,7 +24,7 @@ jobs: runs-on: ubuntu-latest strategy: matrix: - os: [debian13, debian12, debian11, ubuntu25.04, ubuntu24.04, ubuntu22.04] + os: [debian13, debian12, debian11, ubuntu25.10, ubuntu24.04, ubuntu22.04] steps: - uses: actions/checkout@v2 - uses: actions/setup-python@v2 From 52c2593c9745e6580a0685d75e908cf67a41be54 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 24 Oct 2025 06:35:21 +0200 Subject: [PATCH 3/6] use ubuntu mirror for tests --- .ci/debian11_py3/Dockerfile | 2 +- .ci/debian12_py3/Dockerfile | 2 +- .ci/debian13_py3/Dockerfile | 2 +- .ci/ubuntu22.04_py3/Dockerfile | 2 +- .ci/ubuntu24.04_py3/Dockerfile | 3 ++- .ci/ubuntu25.10_py3/Dockerfile | 4 ++-- 6 files changed, 8 insertions(+), 7 deletions(-) diff --git a/.ci/debian11_py3/Dockerfile b/.ci/debian11_py3/Dockerfile index ec50a61..ee766a3 100644 --- a/.ci/debian11_py3/Dockerfile +++ b/.ci/debian11_py3/Dockerfile @@ -1,6 +1,6 @@ FROM debian:bullseye -MAINTAINER DESY, Jan Kotanski +# MAINTAINER DESY, Jan Kotanski RUN apt-get update diff --git a/.ci/debian12_py3/Dockerfile b/.ci/debian12_py3/Dockerfile index 8309b5b..dd31cd3 100644 --- a/.ci/debian12_py3/Dockerfile +++ b/.ci/debian12_py3/Dockerfile @@ -1,6 +1,6 @@ FROM debian:bookworm -MAINTAINER DESY, Jan Kotanski +# MAINTAINER DESY, Jan Kotanski RUN apt-get update diff --git a/.ci/debian13_py3/Dockerfile b/.ci/debian13_py3/Dockerfile index 99a91f1..c2b626c 100644 --- a/.ci/debian13_py3/Dockerfile +++ b/.ci/debian13_py3/Dockerfile @@ -1,6 +1,6 @@ FROM debian:trixie -MAINTAINER DESY, Jan Kotanski +# MAINTAINER DESY, Jan Kotanski RUN apt-get update diff --git a/.ci/ubuntu22.04_py3/Dockerfile b/.ci/ubuntu22.04_py3/Dockerfile index 8b0f27c..07c75f0 100644 --- a/.ci/ubuntu22.04_py3/Dockerfile +++ b/.ci/ubuntu22.04_py3/Dockerfile @@ -1,6 +1,6 @@ FROM ubuntu:22.04 -MAINTAINER DESY, Jan Kotanski +# MAINTAINER DESY, Jan Kotanski RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list RUN apt-get update diff --git a/.ci/ubuntu24.04_py3/Dockerfile b/.ci/ubuntu24.04_py3/Dockerfile index ab6b615..ca35ce3 100644 --- a/.ci/ubuntu24.04_py3/Dockerfile +++ b/.ci/ubuntu24.04_py3/Dockerfile @@ -1,8 +1,9 @@ FROM ubuntu:24.04 -MAINTAINER DESY, Jan Kotanski +# MAINTAINER DESY, Jan Kotanski +RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list RUN apt-get update RUN apt-get install -y base-passwd apt-utils dialog -y RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections diff --git a/.ci/ubuntu25.10_py3/Dockerfile b/.ci/ubuntu25.10_py3/Dockerfile index 59a7168..7dcf1e9 100644 --- a/.ci/ubuntu25.10_py3/Dockerfile +++ b/.ci/ubuntu25.10_py3/Dockerfile @@ -1,8 +1,8 @@ FROM ubuntu:25.10 -MAINTAINER DESY, Jan Kotanski - +# MAINTAINER DESY, Jan Kotanski +RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list RUN apt-get update RUN apt-get install -y base-passwd apt-utils dialog -y RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections From 64d3a9f4805e6974462109381c33a25d15f473f2 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 24 Oct 2025 06:40:28 +0200 Subject: [PATCH 4/6] update ubuntu25.10 ci --- .ci/ubuntu25.10_py3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/ubuntu25.10_py3/Dockerfile b/.ci/ubuntu25.10_py3/Dockerfile index 7dcf1e9..8585416 100644 --- a/.ci/ubuntu25.10_py3/Dockerfile +++ b/.ci/ubuntu25.10_py3/Dockerfile @@ -14,7 +14,7 @@ RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/questing-pni-hdr RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq dist-upgrade RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq install -y python3-sphinx apt-utils net-tools -RUN apt-get -qq install -y python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev libatlas-base-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py +RUN apt-get -qq install -y python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle-serial-links python3-pytest git cmake doxygen python3-sphinx libboost-all-dev RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 RUN useradd -ms /bin/bash tango From 61191ced873c85abc5e6304ee5eee41037fd37a3 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 24 Oct 2025 06:45:23 +0200 Subject: [PATCH 5/6] update ubuntu repo url --- .ci/ubuntu24.04_py3/Dockerfile | 2 +- .ci/ubuntu25.10_py3/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.ci/ubuntu24.04_py3/Dockerfile b/.ci/ubuntu24.04_py3/Dockerfile index ca35ce3..7996798 100644 --- a/.ci/ubuntu24.04_py3/Dockerfile +++ b/.ci/ubuntu24.04_py3/Dockerfile @@ -3,7 +3,7 @@ FROM ubuntu:24.04 # MAINTAINER DESY, Jan Kotanski -RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list +RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list.d/ubuntu.sources RUN apt-get update RUN apt-get install -y base-passwd apt-utils dialog -y RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections diff --git a/.ci/ubuntu25.10_py3/Dockerfile b/.ci/ubuntu25.10_py3/Dockerfile index 8585416..36ef0b7 100644 --- a/.ci/ubuntu25.10_py3/Dockerfile +++ b/.ci/ubuntu25.10_py3/Dockerfile @@ -2,7 +2,7 @@ FROM ubuntu:25.10 # MAINTAINER DESY, Jan Kotanski -RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list +RUN sed -i 's|http://archive|http://de.archive|g' /etc/apt/sources.list.d/ubuntu.sources RUN apt-get update RUN apt-get install -y base-passwd apt-utils dialog -y RUN echo 'debconf debconf/frontend select Noninteractive' | debconf-set-selections From cbb03036503ab1e41850640ca66ae00633cd2388 Mon Sep 17 00:00:00 2001 From: Jan Kotanski Date: Fri, 24 Oct 2025 06:48:39 +0200 Subject: [PATCH 6/6] update questing docker --- .ci/ubuntu25.10_py3/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/ubuntu25.10_py3/Dockerfile b/.ci/ubuntu25.10_py3/Dockerfile index 36ef0b7..4649c84 100644 --- a/.ci/ubuntu25.10_py3/Dockerfile +++ b/.ci/ubuntu25.10_py3/Dockerfile @@ -15,7 +15,7 @@ RUN cd /etc/apt/sources.list.d && wget http://repos.pni-hdri.de/questing-pni-hdr RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq dist-upgrade RUN apt-get -qq update && export DEBIAN_FRONTEND=noninteractive && apt-get -qq install -y python3-sphinx apt-utils net-tools RUN apt-get -qq install -y python3-numpy libhdf5-dev libboost-regex-dev libboost-program-options-dev libboost-system-dev libboost-date-time-dev libboost-filesystem-dev libblas-dev cython3 python3-setuptools libboost-python-dev python3-numpy-dev g++ python3-h5py -RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle-serial-links python3-pytest git cmake doxygen python3-sphinx libboost-all-dev +RUN apt-get -qq install -y hdf5-filter-plugin bitshuffle python3-pytest git cmake doxygen python3-sphinx libboost-all-dev RUN apt-get -qq install -y libpninexus3.3.0-dev libpninexus3.3.0 libh5cpp0.7.1-dev libh5cpp0.7.1 RUN useradd -ms /bin/bash tango