Merge pull request #1247 from moritz-h/docker-ci

Update CI Docker Images
UniStuttgart-VISUS · Jan 24, 2024 · e60a6d5 · e60a6d5
2 parents 81ba422 + 7b09990
commit e60a6d5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 9 deletions.
diff --git a/.ci/docker/fedora/Dockerfile b/.ci/docker/fedora/Dockerfile
@@ -11,18 +11,20 @@ RUN dnf -y update && dnf -y install \
   ninja-build \
   git \
   clang \
-# vcpkg
+# vcpkg:
   curl zip unzip tar \
+# vcpkg meson (for libsystemd): \
+  diffutils python3-jinja2 \
 # ci checks:
   clang-tools-extra \
-# openssl
+# openssl:
   perl-core \
-# glfw
+# glfw:
   libXcursor-devel libXi-devel libXinerama-devel libXrandr-devel \
-# gmp
+# gmp:
   libtool \
-# mpfr
+# mpfr:
   autoconf-archive \
-# OpenGL
+# OpenGL:
   mesa-libGL-devel mesa-libGLU-devel \
   && dnf clean all
diff --git a/.ci/docker/ubuntu/Dockerfile b/.ci/docker/ubuntu/Dockerfile
@@ -2,7 +2,7 @@
 
 FROM ubuntu:22.04
 
-RUN apt-get update && apt-get install -y \
+RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \
   build-essential \
   cmake \
   ninja-build \
@@ -12,9 +12,10 @@ RUN apt-get update && apt-get install -y \
   libomp-dev \
 # vcpkg:
   curl zip unzip tar \
+# vcpkg meson (for libsystemd):
+  python3-distutils python3-jinja2 \
 # ci checks:
-  clang-format \
-  clang-tidy \
+  clang-format clang-tidy \
 # glfw:
   xorg-dev \
 # gmp: