From d03a288e7d6905a946960ad1f1f6d81c39f3bfbd Mon Sep 17 00:00:00 2001 From: Romain BOULLARD Date: Mon, 17 Aug 2026 01:02:49 +0200 Subject: [PATCH] Development --- Linux/BaseBuilder/Dockerfile | 11 ++--------- Linux/CPPBuilder/Dockerfile | 22 +++------------------- 2 files changed, 5 insertions(+), 28 deletions(-) diff --git a/Linux/BaseBuilder/Dockerfile b/Linux/BaseBuilder/Dockerfile index a216dc0..f84790e 100644 --- a/Linux/BaseBuilder/Dockerfile +++ b/Linux/BaseBuilder/Dockerfile @@ -5,19 +5,12 @@ ENV TZ=Europe/Paris \ DEBIAN_FRONTEND=noninteractive \ PATH="/root/.local/bin:$PATH" -# Use build cache for ccache -RUN --mount=type=cache,target=/ccache - -# Dummy sudo (no security weakening) RUN echo '#!/bin/bash\n$@' > /usr/bin/sudo \ && chmod +x /usr/bin/sudo -# Install base dependencies in one layer RUN apt-get update && apt-get install -y \ unzip \ curl \ wget \ - lsb-release \ - software-properties-common \ - gnupg \ - python3 + python3 \ + pipx diff --git a/Linux/CPPBuilder/Dockerfile b/Linux/CPPBuilder/Dockerfile index 84dacff..e9305c9 100644 --- a/Linux/CPPBuilder/Dockerfile +++ b/Linux/CPPBuilder/Dockerfile @@ -1,22 +1,15 @@ -# Build arguments ARG BASE_BUILDER -# Base image FROM $BASE_BUILDER -# Install system dependencies RUN apt-get update && apt-get install -y \ build-essential \ - cppcheck \ ccache \ - cmake \ - ninja-build \ git \ - pkg-config \ - wget \ lsb-release \ + pkg-config \ software-properties-common \ - pipx + xvfb ENV PATH="/root/.local/bin:${PATH}" @@ -29,6 +22,7 @@ RUN wget https://apt.llvm.org/llvm.sh -O /tmp/llvm.sh \ done \ && rm -f /tmp/llvm.sh* +# Install Infer RUN VERSION=1.2.0; \ curl -sSL "https://github.com/facebook/infer/releases/download/v$VERSION/infer-linux-x86_64-v$VERSION.tar.xz" \ | tar -C /opt -xJ && \ @@ -38,16 +32,6 @@ RUN VERSION=1.2.0; \ RUN pipx install conan \ && pipx install gcovr -# Build and install mold -RUN git clone --branch v2.41.0 https://github.com/rui314/mold.git /tmp/mold \ - && cd /tmp/mold \ - && cmake . -DCMAKE_BUILD_TYPE=Release \ - -DCMAKE_CXX_COMPILER=clang++ \ - -B build \ - && cmake --build build -j$(nproc) \ - && cmake --install build \ - && rm -rf /tmp/mold - # Configure Conan with custom profiles and remote RUN conan config install https://git.romainboullard.com/BigfootDev/ConanProfiles.git --args="--branch main" \ && conan remote add bigfootpackages https://conan.romainboullard.com/artifactory/api/conan/BigfootPackages \