From 7d9672bb2d1c905ae556acf78a0fdd3562a2e926 Mon Sep 17 00:00:00 2001 From: rusdacent Date: Tue, 20 Oct 2020 05:58:22 +0300 Subject: [PATCH] refs #146 update version clang-format --- docker/Dockerfile | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/docker/Dockerfile b/docker/Dockerfile index f5918029..c1b815d0 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -4,6 +4,8 @@ ENV PATH /root/.cargo/bin:$PATH RUN apt update && \ apt install -y --no-install-recommends \ + software-properties-common \ + gpg-agent \ make \ gcc-arm-none-eabi \ binutils-arm-none-eabi \ @@ -19,11 +21,17 @@ RUN apt update && \ python \ python-pip \ libstdc++-arm-none-eabi-newlib \ - libclang-10-dev \ - clang-format-10 \ git \ && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* +RUN wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key| apt-key add - && add-apt-repository "deb http://apt.llvm.org/bionic/ llvm-toolchain-bionic-11 main" + +RUN apt update && \ + apt install -y --no-install-recommends \ + libclang-11-dev \ + clang-format-11 \ + && apt-get clean && rm -rf /var/lib/apt/lists/* /tmp/* /var/tmp/* + RUN curl https://sh.rustup.rs -sSf | sh -s -- -y --profile=minimal --target thumbv7em-none-eabi thumbv7em-none-eabihf && \ rustup component add rustfmt --toolchain stable-x86_64-unknown-linux-gnu