From e7200709454abcfd4ba0f62347084c478510a26e Mon Sep 17 00:00:00 2001 From: Michael Vines Date: Tue, 18 Dec 2018 09:56:43 -0800 Subject: [PATCH] Flip && style --- ci/docker-rust/Dockerfile | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile index a97ef5b84..2d70e08d5 100644 --- a/ci/docker-rust/Dockerfile +++ b/ci/docker-rust/Dockerfile @@ -2,15 +2,15 @@ # ci/buildkite.yml to pick up the new image tag FROM rust:1.31.0 -RUN set -x && \ - apt update && \ - apt-get install apt-transport-https && \ - echo deb https://apt.buildkite.com/buildkite-agent stable main > /etc/apt/sources.list.d/buildkite-agent.list && \ - echo deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main > /etc/apt/sources.list.d/llvm.list && \ - apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 32A37959C2FA5C3C99EFBC32A79206696452D198 && \ - wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - && \ - apt update && \ - apt install -y \ +RUN set -x \ + && apt update \ + && apt-get install apt-transport-https \ + && echo deb https://apt.buildkite.com/buildkite-agent stable main > /etc/apt/sources.list.d/buildkite-agent.list \ + && echo deb http://apt.llvm.org/stretch/ llvm-toolchain-stretch-7 main > /etc/apt/sources.list.d/llvm.list \ + && apt-key adv --no-tty --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 32A37959C2FA5C3C99EFBC32A79206696452D198 \ + && wget -O - https://apt.llvm.org/llvm-snapshot.gpg.key | apt-key add - \ + && apt update \ + && apt install -y \ buildkite-agent \ clang-7 \ cmake \ @@ -19,9 +19,10 @@ RUN set -x && \ llvm-7 \ rsync \ sudo \ - && \ - rustup component add rustfmt && \ - rustup component add clippy && \ - rm -rf /var/lib/apt/lists/* && \ - rustc --version && \ - cargo --version + \ + && rustup component add rustfmt \ + && rustup component add clippy \ + && rm -rf /var/lib/apt/lists/* \ + && rustc --version \ + && cargo --version +