osobh/clawmates
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

image(server): install musl target after rust-toolchain.toml, matching broker
ci / gates (push) Successful in 1m53s
Details
ci / frontend (push) Successful in 24s
Details
ci / publish (push) Successful in 2m12s
Details
ci / rust (push) Failing after 4m44s
Details
ci / e2e (push) Has been skipped
Details

Browse Source 
Same fix pattern that unblocked broker in 534eb72. The `rustup target add`
was landing on the base image's default toolchain, but rust-toolchain.toml
(channel = 1.96.0) can prompt rustup to resolve to a distinct pinned
toolchain the target hasn't been installed on. Move the target install
after the COPY so it lands on the toolchain cargo actually uses.
This commit is contained in:
Omar Sobh
2026-07-05 16:19:42 -07:00
parent 534eb72a95
commit 4b66930796
1 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
images/server.Dockerfile
+9 -5
View File
@@ -7,11 +7,6 @@ ARG TARGETARCH
RUN apt-get update \ RUN apt-get update \
&& apt-get install -y --no-install-recommends musl-tools git cmake make pkg-config \ && apt-get install -y --no-install-recommends musl-tools git cmake make pkg-config \
&& rm -rf /var/lib/apt/lists/* && rm -rf /var/lib/apt/lists/*
RUN case "$TARGETARCH" in \
arm64) echo aarch64-unknown-linux-musl > /rust-target ;; \
*) echo x86_64-unknown-linux-musl > /rust-target ;; \
esac \
&& rustup target add "$(cat /rust-target)"
WORKDIR /src WORKDIR /src
COPY Cargo.toml Cargo.lock rust-toolchain.toml ./ COPY Cargo.toml Cargo.lock rust-toolchain.toml ./
COPY crates ./crates COPY crates ./crates
@@ -19,6 +14,15 @@ COPY tools ./tools
COPY images/seccomp ./images/seccomp COPY images/seccomp ./images/seccomp
COPY migrations ./migrations COPY migrations ./migrations
COPY .sqlx ./.sqlx COPY .sqlx ./.sqlx
# Install the musl target AFTER rust-toolchain.toml is in place, so rustup adds
# it to the toolchain the workspace pins (channel 1.96.0), not the base image's
# default. Doing this before the COPY installs into a toolchain cargo won't
# actually use, and the build then fails with E0463 (no core for musl).
RUN case "$TARGETARCH" in \
arm64) echo aarch64-unknown-linux-musl > /rust-target ;; \
*) echo x86_64-unknown-linux-musl > /rust-target ;; \
esac \
&& rustup target add "$(cat /rust-target)"
ENV SQLX_OFFLINE=true ENV SQLX_OFFLINE=true
# Fetch git deps with the system git (libgit2 fails against Gitea smart-HTTP); # Fetch git deps with the system git (libgit2 fails against Gitea smart-HTTP);
# build the zlib-ng C dep with the musl cross compiler for the static target. # build the zlib-ng C dep with the musl cross compiler for the static target.