Skip to content
Snippets Groups Projects
Commit d01c2091 authored by Louis's avatar Louis :fire:
Browse files

Merge branch 'louis-trunk-patch-48932' into 'trunk'

Update x86.dockerfile

See merge request microhacks/bevy-builder!2
parents f837a5d7 fffa800e
No related branches found
No related tags found
Loading
Pipeline #223 passed with stage
in 7 minutes and 32 seconds
...@@ -4,8 +4,6 @@ FROM ghcr.io/rust-lang/rust:nightly-slim AS trunkbuild ...@@ -4,8 +4,6 @@ FROM ghcr.io/rust-lang/rust:nightly-slim AS trunkbuild
RUN cargo install --locked trunk && \ RUN cargo install --locked trunk && \
rm -rf ~/.cargo/registry/{cache,src} rm -rf ~/.cargo/registry/{cache,src}
RUN which trunk
FROM ghcr.io/rust-lang/rust:nightly-slim FROM ghcr.io/rust-lang/rust:nightly-slim
COPY --from=msdfgen /usr/bin/msdf-atlas-gen /usr/bin/msdf-atlas-gen 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 ...@@ -49,5 +47,4 @@ RUN wget https://lab.lcr.gr/microhacks/flit/-/jobs/artifacts/trunk/raw/target/re
chmod +x flit && \ chmod +x flit && \
mv flit /usr/local/bin/flit mv flit /usr/local/bin/flit
RUN cargo install --locked trunk && \ COPY --from=trunkbuild /usr/local/cargo/bin/trunk /usr/local/cargo/bin/trunk
rm -rf ~/.cargo/registry/{cache,src}
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment