From d3523ebbe5dbc0fd4262959ef643693b6a23097d Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Sun, 19 Aug 2018 08:38:22 -0700
Subject: [PATCH] Nightly image now derives from stable image

---
 ci/docker-rust-nightly/Dockerfile | 15 +++++++--------
 ci/docker-rust/Dockerfile         | 10 +++++++---
 2 files changed, 14 insertions(+), 11 deletions(-)

diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
index 5a56d7dc71..3ebddaf477 100644
--- a/ci/docker-rust-nightly/Dockerfile
+++ b/ci/docker-rust-nightly/Dockerfile
@@ -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
diff --git a/ci/docker-rust/Dockerfile b/ci/docker-rust/Dockerfile
index 8a5e5acbd1..44fdd9a022 100644
--- a/ci/docker-rust/Dockerfile
+++ b/ci/docker-rust/Dockerfile
@@ -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