From 7744ca998f88c89e3cb862ec972f7f19d12511ef Mon Sep 17 00:00:00 2001 From: Petro Karashchenko Date: Mon, 21 Feb 2022 12:40:08 +0200 Subject: [PATCH] Revert "ci: Install Rust via RUN." This reverts commit 2e3b77da8e5c4287c131b4079b6721f46f3c41e3. --- tools/ci/docker/linux/Dockerfile | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/tools/ci/docker/linux/Dockerfile b/tools/ci/docker/linux/Dockerfile index 2157937943..962b54240f 100644 --- a/tools/ci/docker/linux/Dockerfile +++ b/tools/ci/docker/linux/Dockerfile @@ -191,12 +191,6 @@ RUN cd renesas-tools/source/newlib && \ RUN cd /tools/renesas-tools/build/gcc && \ make && make install -# Install Rust and targets supported from NuttX -RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y && \ - $HOME/.cargo/bin/rustup target add thumbv6m-none-eabi && \ - $HOME/.cargo/bin/rustup target add thumbv7m-none-eabi -ENV PATH="$HOME/.cargo/bin:$PATH" - ############################################################################### # Final Docker image used for running CI system. This includes all toolchains # supported by the CI system. @@ -233,6 +227,7 @@ RUN apt-get update -qq && DEBIAN_FRONTEND="noninteractive" apt-get install -y -q python3 \ python3-pip \ python-is-python3 \ + rustc \ u-boot-tools \ unzip \ wget \