Merge branch 'master' into python3

CGAL · Jul 19, 2023 · 5614b39 · 5614b39
2 parents 78f7943 + 47b0319
commit 5614b39
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git 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
@@ -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++

diff --git 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 && \