diff --git a/x86.dockerfile b/x86.dockerfile index 772d4f88468fc0d910fb43cef02f4c2dd9e19f91..afe2a4e43feb521c56d9b4c6090dfe5a29b0a841 100644 --- a/x86.dockerfile +++ b/x86.dockerfile @@ -4,8 +4,6 @@ FROM ghcr.io/rust-lang/rust:nightly-slim AS trunkbuild RUN cargo install --locked trunk && \ rm -rf ~/.cargo/registry/{cache,src} -RUN which trunk - FROM ghcr.io/rust-lang/rust:nightly-slim COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen @@ -49,5 +47,4 @@ RUN wget https://lab.lcr.gr/microhacks/flit/-/jobs/artifacts/trunk/raw/target/re chmod +x flit && \ mv flit /usr/local/bin/flit -RUN cargo install --locked trunk && \ - rm -rf ~/.cargo/registry/{cache,src} +COPY --from=trunkbuild /usr/local/cargo/bin/trunk /usr/local/cargo/bin/trunk