From 21083742cd4beff908fa381b63804d0a725f15c4 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sat, 16 May 2026 16:11:26 +0200 Subject: [PATCH] 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/*