Nightly image now derives from stable image

This commit is contained in:
Michael Vines 2018-08-19 08:38:22 -07:00
parent 133ddb11ff
commit d3523ebbe5
2 changed files with 14 additions and 11 deletions

View File

@ -1,9 +1,8 @@
FROM rustlang/rust:nightly
FROM solanalabs/rust
RUN rustup component add clippy-preview --toolchain=nightly && \
echo deb http://ftp.debian.org/debian stretch-backports main >> /etc/apt/sources.list && \
apt update && \
apt install -y \
llvm-6.0 \
&& \
rm -rf /var/lib/apt/lists/*
RUN set -x && \
rustup install nightly && \
rustup default nightly && \
rustup component add clippy-preview --toolchain=nightly && \
rustc --version && \
cargo --version

View File

@ -1,15 +1,19 @@
FROM rust:1.28
RUN apt update && \
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 && \
apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 32A37959C2FA5C3C99EFBC32A79206696452D198 && \
apt update && \
apt install -y \
buildkite-agent \
cmake \
llvm-6.0 \
rsync \
sudo \
cmake \
&& \
rustup component add rustfmt-preview && \
rm -rf /var/lib/apt/lists/*
rm -rf /var/lib/apt/lists/* && \
rustc --version && \
cargo --version