diff --git a/alma8/Dockerfile b/alma8/Dockerfile index 020586c..aef8170 100644 --- a/alma8/Dockerfile +++ b/alma8/Dockerfile @@ -1,21 +1,18 @@ FROM gitlab-registry.cern.ch/linuxsupport/alma8-base COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf update -q -y \ +RUN dnf update -y \ && dnf install -y epel-release \ && dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \ - && dnf autoremove \ - && dnf clean all \ && rm -f packages.txt \ - && curl -O -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.sh \ - && sh ./cmake-*.sh --skip-license --prefix=/usr/local/ \ - && rm ./cmake-*.sh - - -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt + && dnf clean all \ + && rm -rf /var/cache/dnf -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt 'openstacksdk<=1.2.0' \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/alma8/packages.txt b/alma8/packages.txt index 3cc23fe..8e68ce9 100644 --- a/alma8/packages.txt +++ b/alma8/packages.txt @@ -52,9 +52,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/alma9/Dockerfile b/alma9/Dockerfile index f41a00c..61f7961 100644 --- a/alma9/Dockerfile +++ b/alma9/Dockerfile @@ -1,21 +1,18 @@ FROM gitlab-registry.cern.ch/linuxsupport/alma9-base COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf update -q -y \ +RUN dnf update -y \ && dnf install -y epel-release \ && dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \ - && dnf autoremove \ - && dnf clean all \ && rm -f packages.txt \ - && curl -O -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.sh \ - && sh ./cmake-*.sh --skip-license --prefix=/usr/local/ \ - && rm ./cmake-*.sh - - -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt + && dnf clean all \ + && rm -rf /var/cache/dnf -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt 'openstacksdk<=1.2.0' \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/alma9/packages.txt b/alma9/packages.txt index f52c5e3..cec7f1e 100644 --- a/alma9/packages.txt +++ b/alma9/packages.txt @@ -53,9 +53,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/fedora37-test/Dockerfile b/fedora37-test/Dockerfile index e733211..cdbff24 100644 --- a/fedora37-test/Dockerfile +++ b/fedora37-test/Dockerfile @@ -1,22 +1,17 @@ - FROM fedora:37 -# RUN useradd -s /bin/bash sftnight - -RUN dnf update -y \ - && dnf clean all \ - && rm -rf /var/cache/dnf - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf install $(cat packages.txt) -y --setopt=install_weak_deps=False \ +RUN dnf update -y \ + && dnf install $(cat packages.txt) -y --setopt=install_weak_deps=False \ && rm -f packages.txt \ && dnf clean all \ && rm -rf /var/cache/dnf -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/fedora37-test/packages.txt b/fedora37-test/packages.txt index 22800e4..18f9484 100644 --- a/fedora37-test/packages.txt +++ b/fedora37-test/packages.txt @@ -1,4 +1,3 @@ - avahi-compat-libdns_sd-devel avahi-devel binutils @@ -47,9 +46,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/fedora37/Dockerfile b/fedora37/Dockerfile index e733211..f31067b 100644 --- a/fedora37/Dockerfile +++ b/fedora37/Dockerfile @@ -1,22 +1,17 @@ - FROM fedora:37 -# RUN useradd -s /bin/bash sftnight - -RUN dnf update -y \ - && dnf clean all \ - && rm -rf /var/cache/dnf - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf install $(cat packages.txt) -y --setopt=install_weak_deps=False \ +RUN dnf update -y \ + && dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \ && rm -f packages.txt \ && dnf clean all \ && rm -rf /var/cache/dnf -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/fedora37/packages.txt b/fedora37/packages.txt index 8b3bdac..648c382 100644 --- a/fedora37/packages.txt +++ b/fedora37/packages.txt @@ -50,11 +50,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-devel -python3-numpy -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/fedora38/Dockerfile b/fedora38/Dockerfile index eac5490..d8003dd 100644 --- a/fedora38/Dockerfile +++ b/fedora38/Dockerfile @@ -1,21 +1,17 @@ FROM fedora:38 -# RUN useradd -s /bin/bash sftnight - -RUN dnf update -y \ - && dnf clean all \ - && rm -rf /var/cache/dnf - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf install $(cat packages.txt) -y --setopt=install_weak_deps=False \ +RUN dnf update -y \ + && dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \ && rm -f packages.txt \ && dnf clean all \ && rm -rf /var/cache/dnf -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/fedora38/packages.txt b/fedora38/packages.txt index 8b3bdac..648c382 100644 --- a/fedora38/packages.txt +++ b/fedora38/packages.txt @@ -50,11 +50,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-devel -python3-numpy -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/fedora39/Dockerfile b/fedora39/Dockerfile index 1d5db03..2d1cb99 100644 --- a/fedora39/Dockerfile +++ b/fedora39/Dockerfile @@ -1,22 +1,18 @@ FROM fedora:39 -# RUN useradd -s /bin/bash sftnight - -RUN dnf update -y \ - && dnf clean all \ - && rm -rf /var/cache/dnf - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt -RUN dnf install $(cat packages.txt) -y --setopt=install_weak_deps=False \ +RUN dnf update -y \ + && dnf install -y --setopt=install_weak_deps=False $(cat packages.txt) \ && rm -f packages.txt \ && dnf clean all \ && rm -rf /var/cache/dnf -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN mkdir -p /py-venv && python3 -m venv /py-venv/ROOT-CI && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt diff --git a/fedora39/packages.txt b/fedora39/packages.txt index 8b3bdac..648c382 100644 --- a/fedora39/packages.txt +++ b/fedora39/packages.txt @@ -50,11 +50,6 @@ protobuf-devel pythia8-devel python3 python3-devel -python3-devel -python3-numpy -python3-numpy -python3-pip -python3-virtualenv qt5-qtwebengine-devel R-devel R-Rcpp-devel diff --git a/ubuntu20/Dockerfile b/ubuntu20/Dockerfile index c9d7be2..6684c6f 100644 --- a/ubuntu20/Dockerfile +++ b/ubuntu20/Dockerfile @@ -1,11 +1,10 @@ FROM ubuntu:20.04 -# RUN useradd -s /bin/bash sftnight - ENV LANG=C.UTF-8 - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt RUN apt-get update -qq \ && ln -sf /usr/share/zoneinfo/UTC /etc/localtime \ @@ -14,25 +13,12 @@ RUN apt-get update -qq \ && apt-get clean -y \ && rm -rf /var/cache/apt/archives/* \ && rm -rf /var/lib/apt/lists/* \ - && rm packages.txt \ - && update-ca-certificates \ - && curl -O -L https://github.com/Kitware/CMake/releases/download/v3.26.2/cmake-3.26.2-linux-x86_64.sh \ - && sh ./cmake-*.sh --skip-license --prefix=/usr/local/ \ - && rm ./cmake-*.sh + && rm packages.txt +RUN update-ca-certificates -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt - - - -#RUN yes | unminimize \ -# && apt-get autoremove -y \ -# && apt-get clean -y \ -# && rm -rf /var/cache/apt/archives/* \ -# && rm -rf /var/lib/apt/lists/* - diff --git a/ubuntu20/packages.txt b/ubuntu20/packages.txt index 74028f0..89b8f65 100644 --- a/ubuntu20/packages.txt +++ b/ubuntu20/packages.txt @@ -66,10 +66,6 @@ ninja-build protobuf-compiler python3 python3-dev -python3-numpy -python3-pip -python3-pytest -python3-setuptools python3-venv qtwebengine5-dev r-base diff --git a/ubuntu22/Dockerfile b/ubuntu22/Dockerfile index 0f213ab..bd2ce41 100644 --- a/ubuntu22/Dockerfile +++ b/ubuntu22/Dockerfile @@ -1,13 +1,10 @@ - FROM ubuntu:22.04 -# RUN useradd -s /bin/bash sftnight - ENV LANG=C.UTF-8 - - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt RUN apt-get update -qq \ && ln -sf /usr/share/zoneinfo/UTC /etc/localtime \ @@ -18,21 +15,10 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* \ && rm packages.txt - - -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN python3 -m pip install --upgrade pip \ - && python3 -m pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ - && rm -f requirements-root.txt requirements-roottest.txt - - RUN update-ca-certificates -#RUN yes | unminimize \ -# && apt-get autoremove -y \ -# && apt-get clean -y \ -# && rm -rf /var/cache/apt/archives/* \ -# && rm -rf /var/lib/apt/lists/* - +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ + && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ + && rm -f requirements-root.txt requirements-roottest.txt diff --git a/ubuntu22/packages.txt b/ubuntu22/packages.txt index 8d2f256..8903478 100644 --- a/ubuntu22/packages.txt +++ b/ubuntu22/packages.txt @@ -67,10 +67,6 @@ ninja-build nlohmann-json3-dev python3 python3-dev -python3-numpy -python3-pip -python3-pytest -python3-setuptools python3-venv qtwebengine5-dev r-base diff --git a/ubuntu2304/Dockerfile b/ubuntu2304/Dockerfile index eaa1e26..c27106f 100644 --- a/ubuntu2304/Dockerfile +++ b/ubuntu2304/Dockerfile @@ -1,13 +1,10 @@ - FROM ubuntu:23.04 -# RUN useradd -s /bin/bash sftnight - ENV LANG=C.UTF-8 - - COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt RUN apt-get update -qq \ && ln -sf /usr/share/zoneinfo/UTC /etc/localtime \ @@ -18,20 +15,10 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* \ && rm packages.txt +RUN update-ca-certificates - -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN mkdir -p /py-venv && python3 -m venv /py-venv/ROOT-CI && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt - -RUN update-ca-certificates - -#RUN yes | unminimize \ -# && apt-get autoremove -y \ -# && apt-get clean -y \ -# && rm -rf /var/cache/apt/archives/* \ -# && rm -rf /var/lib/apt/lists/* - diff --git a/ubuntu2304/packages.txt b/ubuntu2304/packages.txt index 69fb23e..ae53088 100644 --- a/ubuntu2304/packages.txt +++ b/ubuntu2304/packages.txt @@ -67,10 +67,6 @@ ninja-build nlohmann-json3-dev python3 python3-dev -python3-numpy -python3-pip -python3-pytest -python3-setuptools python3-venv qtwebengine5-dev r-base diff --git a/ubuntu2310/Dockerfile b/ubuntu2310/Dockerfile index 820bbc0..9392a1d 100644 --- a/ubuntu2310/Dockerfile +++ b/ubuntu2310/Dockerfile @@ -1,10 +1,10 @@ FROM ubuntu:23.10 -# RUN useradd -s /bin/bash sftnight - ENV LANG=C.UTF-8 COPY packages.txt packages.txt +ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt +ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt RUN apt-get update -qq \ && ln -sf /usr/share/zoneinfo/UTC /etc/localtime \ @@ -15,20 +15,10 @@ RUN apt-get update -qq \ && rm -rf /var/lib/apt/lists/* \ && rm packages.txt +RUN update-ca-certificates - -ADD https://raw.githubusercontent.com/root-project/root/master/requirements.txt requirements-root.txt -ADD https://raw.githubusercontent.com/root-project/roottest/master/requirements.txt requirements-roottest.txt - -RUN mkdir -p /py-venv && python3 -m venv /py-venv/ROOT-CI && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ +RUN mkdir -p /py-venv \ + && python3 -m venv /py-venv/ROOT-CI \ + && /py-venv/ROOT-CI/bin/pip install --upgrade pip \ && /py-venv/ROOT-CI/bin/pip install -r requirements-root.txt -r requirements-roottest.txt openstacksdk \ && rm -f requirements-root.txt requirements-roottest.txt - -RUN update-ca-certificates - -#RUN yes | unminimize \ -# && apt-get autoremove -y \ -# && apt-get clean -y \ -# && rm -rf /var/cache/apt/archives/* \ -# && rm -rf /var/lib/apt/lists/* - diff --git a/ubuntu2310/packages.txt b/ubuntu2310/packages.txt index 69fb23e..ae53088 100644 --- a/ubuntu2310/packages.txt +++ b/ubuntu2310/packages.txt @@ -67,10 +67,6 @@ ninja-build nlohmann-json3-dev python3 python3-dev -python3-numpy -python3-pip -python3-pytest -python3-setuptools python3-venv qtwebengine5-dev r-base