From 21083742cd4beff908fa381b63804d0a725f15c4 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 16:11:26 +0200 Subject: [PATCH 1/8] update dockerfiles --- .ci/Arch/Dockerfile | 28 +++++++++--------- .ci/Debian12/Dockerfile | 47 ++++++++++++++---------------- .ci/Debian13/Dockerfile | 47 +++++++++++++----------------- .ci/Fedora43/Dockerfile | 31 +++++++++++--------- .ci/Fedora44/Dockerfile | 31 +++++++++++--------- .ci/Servatrice_Debian12/Dockerfile | 34 ++++++++++----------- .ci/Ubuntu24.04/Dockerfile | 46 +++++++++++++---------------- .ci/Ubuntu26.04/Dockerfile | 47 +++++++++++++----------------- 8 files changed, 148 insertions(+), 163 deletions(-) diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index 36cf5c4ae..32874f9c8 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -1,19 +1,17 @@ from archlinux:latest RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ - base-devel \ - ccache \ - cmake \ - git \ - gtest \ - mariadb-libs \ - ninja \ - protobuf \ - qt6-base \ - qt6-imageformats \ - qt6-multimedia \ - qt6-svg \ - qt6-tools \ - qt6-translations \ - qt6-websockets \ + ccache \ + cmake \ + gcc \ + git \ + gtest \ + ninja \ + protobuf \ + qt6-imageformats \ + qt6-multimedia \ + qt6-svg \ + qt6-tools \ + qt6-translations \ + qt6-websockets \ && pacman --sync --clean --clean --noconfirm diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index 202405b84..3fb52675d 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -1,28 +1,25 @@ FROM debian:12 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ccache \ - clang-format \ - cmake \ - file \ - g++ \ - git \ - libgl-dev \ - liblzma-dev \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6multimedia6 \ - libqt6sql6-mysql \ - ninja-build \ - protobuf-compiler \ - qt6-image-formats-plugins \ - qt6-l10n-tools \ - qt6-multimedia-dev \ - qt6-svg-dev \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ - && apt-get clean \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ccache \ + cmake \ + g++ \ + git \ + libgl-dev \ + liblzma-dev \ + libprotobuf-dev \ + libqt6multimedia6 \ + libqt6sql6-mysql \ + ninja-build \ + protobuf-compiler \ + qt6-image-formats-plugins \ + qt6-l10n-tools \ + qt6-multimedia-dev \ + qt6-svg-dev \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index d7ab6ac86..0783f5af8 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -1,29 +1,24 @@ FROM debian:13 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - ccache \ - clang-format \ - cmake \ - file \ - g++ \ - git \ - libgl-dev \ - liblzma-dev \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6multimedia6 \ - libqt6sql6-mysql \ - ninja-build \ - protobuf-compiler \ - qt6-image-formats-plugins \ - qt6-l10n-tools \ - qt6-multimedia-dev \ - qt6-svg-dev \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ - && apt-get clean \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ccache \ + cmake \ + g++ \ + git \ + libgl-dev \ + liblzma-dev \ + libprotobuf-dev \ + libqt6multimedia6 \ + ninja-build \ + protobuf-compiler \ + qt6-image-formats-plugins \ + qt6-l10n-tools \ + qt6-multimedia-dev \ + qt6-svg-dev \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 27570cf99..345f43049 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -1,16 +1,19 @@ FROM fedora:43 -RUN dnf install -y \ - ccache \ - cmake \ - gcc-c++ \ - git \ - mariadb-devel \ - ninja-build \ - protobuf-devel \ - qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ - qt6-qtimageformats \ - rpm-build \ - xz-devel \ - zlib-devel \ - && dnf clean all +RUN dnf install -y --setopt=install_weak_deps=False \ + ccache \ + cmake \ + gcc-c++ \ + git \ + ninja-build \ + protobuf-devel \ + qt6-qttools-devel \ + qt6-qtsvg-devel \ + qt6-qtmultimedia-devel \ + qt6-qtwebsockets-devel \ + qt6-qtimageformats \ + rpm-build \ + xz-devel \ + zlib-devel \ + && dnf clean all \ + && rm -rf /var/cache/dnf diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index e6c8da7f3..42c6730c5 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -1,16 +1,19 @@ FROM fedora:44 -RUN dnf install -y \ - ccache \ - cmake \ - gcc-c++ \ - git \ - mariadb-devel \ - ninja-build \ - protobuf-devel \ - qt6-{qttools,qtsvg,qtmultimedia,qtwebsockets}-devel \ - qt6-qtimageformats \ - rpm-build \ - xz-devel \ - zlib-devel \ - && dnf clean all +RUN dnf install -y --setopt=install_weak_deps=False \ + ccache \ + cmake \ + gcc-c++ \ + git \ + ninja-build \ + protobuf-devel \ + qt6-qttools-devel \ + qt6-qtsvg-devel \ + qt6-qtmultimedia-devel \ + qt6-qtwebsockets-devel \ + qt6-qtimageformats \ + rpm-build \ + xz-devel \ + zlib-devel \ + && dnf clean all \ + && rm -rf /var/cache/dnf diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile index 21f6a036e..1b5cbb7f1 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -1,21 +1,19 @@ FROM debian:12 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ccache \ - clang-format \ - cmake \ - file \ - g++ \ - git \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6sql6-mysql \ - ninja-build \ - protobuf-compiler \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ - && apt-get clean \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ccache \ + cmake \ + g++ \ + git \ + libmariadb-dev-compat \ + libprotobuf-dev \ + libqt6sql6-mysql \ + ninja-build \ + protobuf-compiler \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index 809b2e43a..6339c4a9c 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -1,28 +1,24 @@ FROM ubuntu:24.04 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ccache \ - clang-format \ - cmake \ - file \ - g++ \ - git \ - libgl-dev \ - liblzma-dev \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6multimedia6 \ - libqt6sql6-mysql \ - ninja-build \ - protobuf-compiler \ - qt6-image-formats-plugins \ - qt6-l10n-tools \ - qt6-multimedia-dev \ - qt6-svg-dev \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ - && apt-get clean \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ccache \ + cmake \ + g++ \ + git \ + libgl-dev \ + liblzma-dev \ + libprotobuf-dev \ + libqt6multimedia6 \ + ninja-build \ + protobuf-compiler \ + qt6-image-formats-plugins \ + qt6-l10n-tools \ + qt6-multimedia-dev \ + qt6-svg-dev \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && rm -rf /var/lib/apt/lists/* diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index 7b0cd389f..df06aad81 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -1,29 +1,24 @@ FROM ubuntu:26.04 -RUN apt-get update && \ - DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \ - build-essential \ - ca-certificates \ - ccache \ - clang-format \ - cmake \ - file \ - g++ \ - git \ - libgl-dev \ - liblzma-dev \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6multimedia6 \ - libqt6sql6-mysql \ - ninja-build \ - protobuf-compiler \ - qt6-image-formats-plugins \ - qt6-l10n-tools \ - qt6-multimedia-dev \ - qt6-svg-dev \ - qt6-tools-dev \ - qt6-tools-dev-tools \ - qt6-websockets-dev \ - && apt-get clean \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + ccache \ + cmake \ + g++ \ + git \ + libgl-dev \ + liblzma-dev \ + libprotobuf-dev \ + libqt6multimedia6 \ + ninja-build \ + protobuf-compiler \ + qt6-image-formats-plugins \ + qt6-l10n-tools \ + qt6-multimedia-dev \ + qt6-svg-dev \ + qt6-tools-dev \ + qt6-tools-dev-tools \ + qt6-websockets-dev \ && rm -rf /var/lib/apt/lists/* From 93bf88b62c67a89deab3c951254150bd49b35907 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 16:45:20 +0200 Subject: [PATCH 2/8] fix deb package creation --- .ci/Debian12/Dockerfile | 1 + .ci/Debian13/Dockerfile | 1 + .ci/Servatrice_Debian12/Dockerfile | 1 + .ci/Ubuntu24.04/Dockerfile | 1 + .ci/Ubuntu26.04/Dockerfile | 1 + 5 files changed, 5 insertions(+) diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index 3fb52675d..5ea08ac2c 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ccache \ cmake \ + file \ g++ \ git \ libgl-dev \ diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index 0783f5af8..c69874a8a 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ccache \ cmake \ + file \ g++ \ git \ libgl-dev \ diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile index 1b5cbb7f1..91e507639 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ccache \ cmake \ + file \ g++ \ git \ libmariadb-dev-compat \ diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index 6339c4a9c..d6aac7733 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ccache \ cmake \ + file \ g++ \ git \ libgl-dev \ diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index df06aad81..3a0336422 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -6,6 +6,7 @@ RUN apt-get update \ && apt-get install -y --no-install-recommends \ ccache \ cmake \ + file \ g++ \ git \ libgl-dev \ From 0fd68b30480ca68fb9eff889022b724c633607cc Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 17:45:01 +0200 Subject: [PATCH 3/8] provide gtest to avoid downloads --- .ci/Debian12/Dockerfile | 2 +- .ci/Debian13/Dockerfile | 1 + .ci/Fedora43/Dockerfile | 1 + .ci/Fedora44/Dockerfile | 1 + .ci/Ubuntu24.04/Dockerfile | 1 + .ci/Ubuntu26.04/Dockerfile | 1 + 6 files changed, 6 insertions(+), 1 deletion(-) diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index 5ea08ac2c..cf94dd1c7 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -10,10 +10,10 @@ RUN apt-get update \ g++ \ git \ libgl-dev \ + libgtest-dev \ liblzma-dev \ libprotobuf-dev \ libqt6multimedia6 \ - libqt6sql6-mysql \ ninja-build \ protobuf-compiler \ qt6-image-formats-plugins \ diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index c69874a8a..b9e238263 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ g++ \ git \ libgl-dev \ + libgtest-dev \ liblzma-dev \ libprotobuf-dev \ libqt6multimedia6 \ diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 345f43049..2536f3ffa 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -5,6 +5,7 @@ RUN dnf install -y --setopt=install_weak_deps=False \ cmake \ gcc-c++ \ git \ + gtest-devel \ ninja-build \ protobuf-devel \ qt6-qttools-devel \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index 42c6730c5..3a301c7be 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -5,6 +5,7 @@ RUN dnf install -y --setopt=install_weak_deps=False \ cmake \ gcc-c++ \ git \ + gtest-devel \ ninja-build \ protobuf-devel \ qt6-qttools-devel \ diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index d6aac7733..b9619abd4 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ g++ \ git \ libgl-dev \ + libgtest-dev \ liblzma-dev \ libprotobuf-dev \ libqt6multimedia6 \ diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index 3a0336422..3a765f87f 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -10,6 +10,7 @@ RUN apt-get update \ g++ \ git \ libgl-dev \ + libgtest-dev \ liblzma-dev \ libprotobuf-dev \ libqt6multimedia6 \ From 4a2699e8c59f8339511a3007012c0edb1d6b1a62 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 18:05:07 +0200 Subject: [PATCH 4/8] remove git --- .ci/Arch/Dockerfile | 1 - .ci/Debian12/Dockerfile | 1 - .ci/Debian13/Dockerfile | 1 - .ci/Fedora43/Dockerfile | 1 - .ci/Fedora44/Dockerfile | 1 - .ci/Servatrice_Debian12/Dockerfile | 1 - .ci/Ubuntu24.04/Dockerfile | 1 - .ci/Ubuntu26.04/Dockerfile | 1 - 8 files changed, 8 deletions(-) diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index 32874f9c8..28213e7ab 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -4,7 +4,6 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ ccache \ cmake \ gcc \ - git \ gtest \ ninja \ protobuf \ diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index cf94dd1c7..41b5041f6 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ cmake \ file \ g++ \ - git \ libgl-dev \ libgtest-dev \ liblzma-dev \ diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index b9e238263..76f681ffa 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ cmake \ file \ g++ \ - git \ libgl-dev \ libgtest-dev \ liblzma-dev \ diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 2536f3ffa..18da70b34 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -4,7 +4,6 @@ RUN dnf install -y --setopt=install_weak_deps=False \ ccache \ cmake \ gcc-c++ \ - git \ gtest-devel \ ninja-build \ protobuf-devel \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index 3a301c7be..3a7fbf047 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -4,7 +4,6 @@ RUN dnf install -y --setopt=install_weak_deps=False \ ccache \ cmake \ gcc-c++ \ - git \ gtest-devel \ ninja-build \ protobuf-devel \ diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile index 91e507639..1af40a59c 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ cmake \ file \ g++ \ - git \ libmariadb-dev-compat \ libprotobuf-dev \ libqt6sql6-mysql \ diff --git a/.ci/Ubuntu24.04/Dockerfile b/.ci/Ubuntu24.04/Dockerfile index b9619abd4..a54889d00 100644 --- a/.ci/Ubuntu24.04/Dockerfile +++ b/.ci/Ubuntu24.04/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ cmake \ file \ g++ \ - git \ libgl-dev \ libgtest-dev \ liblzma-dev \ diff --git a/.ci/Ubuntu26.04/Dockerfile b/.ci/Ubuntu26.04/Dockerfile index 3a765f87f..fbcd1aa48 100644 --- a/.ci/Ubuntu26.04/Dockerfile +++ b/.ci/Ubuntu26.04/Dockerfile @@ -8,7 +8,6 @@ RUN apt-get update \ cmake \ file \ g++ \ - git \ libgl-dev \ libgtest-dev \ liblzma-dev \ From 08cfd80a6a6cd8d7140a67c73f92f8fecbd42221 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 18:22:44 +0200 Subject: [PATCH 5/8] remove gtest for arch --- .ci/Arch/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index 28213e7ab..3f2a5425d 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -4,7 +4,7 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ ccache \ cmake \ gcc \ - gtest \ + # gtest Exclude gtest to confirm fallback of downloading source from google repo keeps working ninja \ protobuf \ qt6-imageformats \ From 280900a4a7c1382fcb377a2be11c50bc08cc9d75 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 18:51:54 +0200 Subject: [PATCH 6/8] use slim images --- .ci/Debian12/Dockerfile | 2 +- .ci/Debian13/Dockerfile | 2 +- .ci/Servatrice_Debian12/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Debian12/Dockerfile b/.ci/Debian12/Dockerfile index 41b5041f6..4c7d41f09 100644 --- a/.ci/Debian12/Dockerfile +++ b/.ci/Debian12/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12 +FROM debian:12-slim ARG DEBIAN_FRONTEND=noninteractive diff --git a/.ci/Debian13/Dockerfile b/.ci/Debian13/Dockerfile index 76f681ffa..6b860b69b 100644 --- a/.ci/Debian13/Dockerfile +++ b/.ci/Debian13/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:13 +FROM debian:13-slim ARG DEBIAN_FRONTEND=noninteractive diff --git a/.ci/Servatrice_Debian12/Dockerfile b/.ci/Servatrice_Debian12/Dockerfile index 1af40a59c..9eb586384 100644 --- a/.ci/Servatrice_Debian12/Dockerfile +++ b/.ci/Servatrice_Debian12/Dockerfile @@ -1,4 +1,4 @@ -FROM debian:12 +FROM debian:12-slim ARG DEBIAN_FRONTEND=noninteractive From 9a61947fd268105ecc43d863ff92657330a3b2ce Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 21:01:45 +0200 Subject: [PATCH 7/8] sort --- .ci/Fedora43/Dockerfile | 8 ++++---- .ci/Fedora44/Dockerfile | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index 18da70b34..a92e869e1 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -7,11 +7,11 @@ RUN dnf install -y --setopt=install_weak_deps=False \ gtest-devel \ ninja-build \ protobuf-devel \ - qt6-qttools-devel \ - qt6-qtsvg-devel \ - qt6-qtmultimedia-devel \ - qt6-qtwebsockets-devel \ qt6-qtimageformats \ + qt6-qtmultimedia-devel \ + qt6-qtsvg-devel \ + qt6-qttools-devel \ + qt6-qtwebsockets-devel \ rpm-build \ xz-devel \ zlib-devel \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index 3a7fbf047..1a2016452 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -7,11 +7,11 @@ RUN dnf install -y --setopt=install_weak_deps=False \ gtest-devel \ ninja-build \ protobuf-devel \ - qt6-qttools-devel \ - qt6-qtsvg-devel \ - qt6-qtmultimedia-devel \ - qt6-qtwebsockets-devel \ qt6-qtimageformats \ + qt6-qtmultimedia-devel \ + qt6-qtsvg-devel \ + qt6-qttools-devel \ + qt6-qtwebsockets-devel \ rpm-build \ xz-devel \ zlib-devel \ From 14304e50368d67f1f70cc15f6429550959e40b68 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 21:26:35 +0200 Subject: [PATCH 8/8] no docs --- .ci/Arch/Dockerfile | 2 +- .ci/Fedora43/Dockerfile | 2 +- .ci/Fedora44/Dockerfile | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.ci/Arch/Dockerfile b/.ci/Arch/Dockerfile index 3f2a5425d..9a7978a79 100644 --- a/.ci/Arch/Dockerfile +++ b/.ci/Arch/Dockerfile @@ -4,7 +4,7 @@ RUN pacman --sync --refresh --sysupgrade --needed --noconfirm \ ccache \ cmake \ gcc \ - # gtest Exclude gtest to confirm fallback of downloading source from google repo keeps working + # gtest Exclude gtest to confirm fallback download and building from google repo keeps working ninja \ protobuf \ qt6-imageformats \ diff --git a/.ci/Fedora43/Dockerfile b/.ci/Fedora43/Dockerfile index a92e869e1..b9e0048fe 100644 --- a/.ci/Fedora43/Dockerfile +++ b/.ci/Fedora43/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:43 -RUN dnf install -y --setopt=install_weak_deps=False \ +RUN dnf install -y --nodocs --setopt=install_weak_deps=False \ ccache \ cmake \ gcc-c++ \ diff --git a/.ci/Fedora44/Dockerfile b/.ci/Fedora44/Dockerfile index 1a2016452..fa55fa970 100644 --- a/.ci/Fedora44/Dockerfile +++ b/.ci/Fedora44/Dockerfile @@ -1,6 +1,6 @@ FROM fedora:44 -RUN dnf install -y --setopt=install_weak_deps=False \ +RUN dnf install -y --nodocs --setopt=install_weak_deps=False \ ccache \ cmake \ gcc-c++ \