From 99bc383f9e94a415ff1dcef1c45ccc4c8dab1a9e Mon Sep 17 00:00:00 2001 From: Ruben Fiszel Date: Sun, 8 Feb 2026 12:03:57 +0000 Subject: [PATCH] fix: install mold+clang in Docker for cargo linker config The .cargo/config.toml uses mold linker for x86_64-linux (all profiles). Install mold+clang in the main Dockerfile. For RHEL images where mold isn't available, override via env vars to use the default linker. Co-Authored-By: Claude Opus 4.6 --- Dockerfile | 2 +- docker/RHEL8/Dockerfile | 2 ++ docker/RHEL9/Dockerfile | 2 ++ 3 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index efe09ae9ef..459d735925 100644 --- a/Dockerfile +++ b/Dockerfile @@ -23,7 +23,7 @@ RUN make FROM ${RUST_IMAGE} AS rust_base -RUN apt-get update && apt-get install -y git libssl-dev pkg-config npm +RUN apt-get update && apt-get install -y git libssl-dev pkg-config npm mold clang RUN apt-get -y update \ && apt-get install -y \ diff --git a/docker/RHEL8/Dockerfile b/docker/RHEL8/Dockerfile index 224e954125..2d36cca051 100644 --- a/docker/RHEL8/Dockerfile +++ b/docker/RHEL8/Dockerfile @@ -16,6 +16,8 @@ RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef --version ^0.1 WORKDIR /windmill ENV SQLX_OFFLINE=true +ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=cc +ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="" # ENV CARGO_INCREMENTAL=1 FROM node:20-alpine as frontend diff --git a/docker/RHEL9/Dockerfile b/docker/RHEL9/Dockerfile index f21ebb8f10..424fb19158 100644 --- a/docker/RHEL9/Dockerfile +++ b/docker/RHEL9/Dockerfile @@ -16,6 +16,8 @@ RUN CARGO_NET_GIT_FETCH_WITH_CLI=true cargo install cargo-chef --version ^0.1 WORKDIR /windmill ENV SQLX_OFFLINE=true +ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_LINKER=cc +ENV CARGO_TARGET_X86_64_UNKNOWN_LINUX_GNU_RUSTFLAGS="" # ENV CARGO_INCREMENTAL=1 FROM node:20-alpine as frontend