From 9a6876e60b7394a1c2de73c57c5a8813bbe3e240 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Mon, 10 Jul 2023 13:13:22 +0200 Subject: [PATCH 1/2] Do no use dnf-shell (not in dnf5) --- Fedora-rawhide/Dockerfile | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/Fedora-rawhide/Dockerfile b/Fedora-rawhide/Dockerfile index 89c011a..e29669d 100644 --- a/Fedora-rawhide/Dockerfile +++ b/Fedora-rawhide/Dockerfile @@ -2,7 +2,8 @@ FROM fedora:rawhide ARG dockerfile_url ENV DOCKERFILE_URL=$dockerfile_url -RUN echo "install make cmake gcc-c++ \ +RUN dnf -y upgrade && \ + dnf -y install make cmake gcc-c++ \ util-linux \ gmp-devel.x86_64 mpfr-devel.x86_64 \ boost-devel.x86_64 \ @@ -21,10 +22,7 @@ RUN echo "install make cmake gcc-c++ \ zlib-devel.x86_64 \ diffutils \ wget \ - tar" >> dnf-cmd && \ - echo update >> dnf-cmd && \ - echo run >> dnf-cmd && \ - dnf -y --refresh shell dnf-cmd && rm dnf-cmd && \ + tar && \ dnf clean all && \ wget https://registrationcenter-download.intel.com/akdlm/irc_nas/19143/l_tbb_oneapi_p_2021.8.0.25334_offline.sh && \ bash l_tbb_oneapi_p_2021.8.0.25334_offline.sh -a --action install --eula accept -s && \ From 47b03195d92aa6b4c3a5f700690f65c3bb247135 Mon Sep 17 00:00:00 2001 From: Laurent Rineau Date: Tue, 18 Jul 2023 16:25:58 +0200 Subject: [PATCH 2/2] fix broken platforms --- Debian-stable/Dockerfile | 2 +- Debian-testing-clang-main/Dockerfile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Debian-stable/Dockerfile b/Debian-stable/Dockerfile index c40584b..7551c51 100644 --- a/Debian-stable/Dockerfile +++ b/Debian-stable/Dockerfile @@ -32,6 +32,6 @@ RUN apt-get update && apt-get install -y \ ENV CGAL_TEST_PLATFORM="Debian-Stable" -ENV CGAL_CMAKE_FLAGS="(-DWITH_CGAL_Qt5=OFF \")" +ENV CGAL_CMAKE_FLAGS="(\"-DWITH_CGAL_Qt5=OFF \")" ENV INIT_FILE=/tmp/init.cmake COPY init.cmake /tmp/init.cmake diff --git a/Debian-testing-clang-main/Dockerfile b/Debian-testing-clang-main/Dockerfile index 4913844..e723497 100644 --- a/Debian-testing-clang-main/Dockerfile +++ b/Debian-testing-clang-main/Dockerfile @@ -6,7 +6,7 @@ RUN apt-get update -y && apt-get install -y wget \ && wget -qO- https://apt.llvm.org/llvm-snapshot.gpg.key | tee /etc/apt/trusted.gpg.d/apt.llvm.org.asc \ && echo 'deb http://apt.llvm.org/unstable/ llvm-toolchain main' > /etc/apt/sources.list.d/llvm.list \ && apt-get update -y \ -&& apt-get install -y clang \ +&& apt-get install -y clang cmake make \ && apt-get clean all ENV CXX=/usr/bin/clang++