From 20159e5550e9b28344bc0617a52391fefee4f192 Mon Sep 17 00:00:00 2001 From: tooomm Date: Sun, 19 Jul 2026 12:58:01 +0200 Subject: [PATCH] formatting --- Dockerfile | 68 +++++++++++++++++++++++++++++------------------------- 1 file changed, 37 insertions(+), 31 deletions(-) diff --git a/Dockerfile b/Dockerfile index ebfad2a29..68ff52285 100644 --- a/Dockerfile +++ b/Dockerfile @@ -3,47 +3,53 @@ FROM ubuntu:26.04 AS build ARG DEBIAN_FRONTEND=noninteractive -RUN apt-get update && apt-get install -y --no-install-recommends \ - build-essential \ - ccache \ - cmake \ - ninja-build \ - file \ - g++ \ - git \ - libmariadb-dev-compat \ - libprotobuf-dev \ - libqt6sql6-mysql \ - qt6-websockets-dev \ - protobuf-compiler \ - qt6-tools-dev \ - qt6-tools-dev-tools +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + build-essential \ + ccache \ + cmake \ + ninja-build \ + file \ + g++ \ + git \ + libmariadb-dev-compat \ + libprotobuf-dev \ + libqt6sql6-mysql \ + qt6-websockets-dev \ + protobuf-compiler \ + qt6-tools-dev \ + qt6-tools-dev-tools ENV CCACHE_DIR=/root/.ccache ENV CCACHE_MAXSIZE=550M WORKDIR /src COPY . . -RUN --mount=type=cache,target=/root/.ccache \ - cmake -S . -B build \ - -G Ninja \ - -DCMAKE_C_COMPILER_LAUNCHER=ccache \ - -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ - -DWITH_SERVER=1 \ - -DWITH_CLIENT=0 \ - -DWITH_ORACLE=0 \ - && cmake --build build \ - && cmake --install build - -RUN ccache --show-stats +RUN --mount=type=cache,id=ccache,target=/root/.ccache \ + cmake \ + -S . \ + -B build \ + -G Ninja \ + -DCMAKE_C_COMPILER_LAUNCHER=ccache \ + -DCMAKE_CXX_COMPILER_LAUNCHER=ccache \ + -DWITH_SERVER=1 \ + -DWITH_CLIENT=0 \ + -DWITH_ORACLE=0 \ + && cmake --build build \ + && cmake --install build \ + && ccache --show-config \ + && ccache --show-stats # -------- Runtime Stage (clean) -------- FROM ubuntu:26.04 -RUN apt-get update && apt-get install -y --no-install-recommends \ - libprotobuf32t64 \ - libqt6sql6-mysql \ - libqt6websockets6 \ +ARG DEBIAN_FRONTEND=noninteractive + +RUN apt-get update \ + && apt-get install -y --no-install-recommends \ + libprotobuf32t64 \ + libqt6sql6-mysql \ + libqt6websockets6 \ && apt-get clean \ && rm -rf /var/lib/apt/lists/*