Skip to content

N
nebula
Commit 22ebfb82 authored by clabby's avatar clabby Committed by GitHub
Browse files
Options

feat(ci): Add `clang` & `lld` back to `ci-builder-rust` (#9704)

parent 9eb49b3c
Hide whitespace changes
Inline Side-by-side
Showing with 5 additions and 2 deletions
ops/docker/ci-builder/Dockerfile
View file @ 22ebfb82
...@@ -10,7 +10,7 @@ SHELL ["/bin/bash", "-c"] ...@@ -10,7 +10,7 @@ SHELL ["/bin/bash", "-c"]
ENV DEBIAN_FRONTEND=noninteractive ENV DEBIAN_FRONTEND=noninteractive
RUN apt-get update && \ 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 && \ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs > rustup.sh && \
chmod +x ./rustup.sh && \ chmod +x ./rustup.sh && \
...@@ -145,10 +145,13 @@ ENTRYPOINT ["/bin/bash", "-c"] ...@@ -145,10 +145,13 @@ ENTRYPOINT ["/bin/bash", "-c"]
FROM base-builder as rust-builder 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 the rust installation, alongside the installed toolchains
COPY --from=rust-build /root/.cargo /root/.cargo COPY --from=rust-build /root/.cargo /root/.cargo
COPY --from=rust-build /root/.rustup /root/.rustup COPY --from=rust-build /root/.rustup /root/.rustup
# copy the rust installation, alongside the installed toolchains # copy the rust installation, alongside the installed toolchains
COPY --from=rust-build /root/.cargo/bin /root/.cargo/bin 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
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment