Skip to content

Commit

Permalink
feat(ci): Add clang & lld back to ci-builder-rust (ethereum-opt…
Browse files Browse the repository at this point in the history
  • Loading branch information
clabby authored Feb 29, 2024
1 parent 9eb49b3 commit 22ebfb8
Showing 1 changed file with 5 additions and 2 deletions.
7 changes: 5 additions & 2 deletions ops/docker/ci-builder/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ SHELL ["/bin/bash", "-c"]

ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \
apt-get install -y curl build-essential git clang lld curl jq
apt-get install -y build-essential git clang lld curl jq

RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
chmod +x ./rustup.sh && \
Expand Down Expand Up @@ -145,10 +145,13 @@ ENTRYPOINT ["/bin/bash", "-c"]

FROM base-builder as rust-builder

# Install clang & lld
RUN apt-get update && apt-get install -y clang lld

# Copy the rust installation, alongside the installed toolchains
COPY --from=rust-build /root/.cargo /root/.cargo
COPY --from=rust-build /root/.rustup /root/.rustup

# copy the rust installation, alongside the installed toolchains
COPY --from=rust-build /root/.cargo/bin /root/.cargo/bin
COPY --from=rust-build /root/.rustup /root/.rustup
COPY --from=rust-build /root/.rustup /root/.rustup

0 comments on commit 22ebfb8

Please sign in to comment.