Skip to content

Commit

Permalink
Reduce number of RUN's
Browse files Browse the repository at this point in the history
  • Loading branch information
cmichi committed Dec 26, 2024
1 parent 987d172 commit ae1db55
Showing 1 changed file with 4 additions and 6 deletions.
10 changes: 4 additions & 6 deletions ci/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -24,8 +24,8 @@ ENV SHELL=/bin/bash \
RUN groupadd -g 1000 nonroot && \
useradd -u 1000 -g 1000 -s /bin/bash -m nonroot

COPY cargo-config /root/.cargo/config
COPY cargo-config /home/nonroot/.cargo/config
COPY ci/cargo-config /root/.cargo/config
COPY ci/cargo-config /home/nonroot/.cargo/config

# base | install tools and dependencies
RUN set -eux; \
Expand Down Expand Up @@ -62,15 +62,13 @@ RUN curl -O "https://github.com/cli/cli/releases/download/v${GH_TOOL_VERSION}/gh
ARG RUST_STABLE_VERSION="1.83.0"

# generic ci | install stable rust
RUN rustup toolchain install "${RUST_STABLE_VERSION}" --profile minimal && \
RUN rustup toolchain install "${RUST_STABLE_VERSION}" --profile minimal\
--component rustfmt clippy && \
rustup default "${RUST_STABLE_VERSION}"

# generic ci | "alias" pinned stable toolchain as generic stable
RUN ln -s "/usr/local/rustup/toolchains/${RUST_STABLE_VERSION}-x86_64-unknown-linux-gnu" /usr/local/rustup/toolchains/stable-x86_64-unknown-linux-gnu

# generic ci | install additional rustup components for the ci tests
RUN rustup component add rust-src rustfmt clippy

# generic ci | install asm toolchain for the default stable toolchain
RUN rustup target add riscv64imac-unknown-none-elf

Expand Down

0 comments on commit ae1db55

Please sign in to comment.