From 84c28a077ad9ad182f3b0ca5140438c9e45d1a3e Mon Sep 17 00:00:00 2001
From: Michael Vines <mvines@gmail.com>
Date: Wed, 11 Jul 2018 22:49:23 -0600
Subject: [PATCH] Use custom rust nightly image with cargo-cov and clippy
 pre-installed

---
 ci/buildkite.yml                  | 2 +-
 ci/docker-rust-nightly/Dockerfile | 3 +++
 ci/docker-rust-nightly/README.md  | 6 ++++++
 ci/docker-rust-nightly/build.sh   | 6 ++++++
 ci/test-nightly.sh                | 1 -
 5 files changed, 16 insertions(+), 2 deletions(-)
 create mode 100644 ci/docker-rust-nightly/Dockerfile
 create mode 100644 ci/docker-rust-nightly/README.md
 create mode 100755 ci/docker-rust-nightly/build.sh

diff --git a/ci/buildkite.yml b/ci/buildkite.yml
index 105a7c436..0551ec400 100644
--- a/ci/buildkite.yml
+++ b/ci/buildkite.yml
@@ -7,7 +7,7 @@ steps:
   - command: "ci/shellcheck.sh"
     name: "shellcheck [public]"
     timeout_in_minutes: 20
-  - command: "ci/docker-run.sh rustlang/rust:nightly ci/test-nightly.sh"
+  - command: "ci/docker-run.sh solanalabs/rust-nightly ci/test-nightly.sh"
     name: "nightly [public]"
     env:
       CARGO_TARGET_CACHE_NAME: "nightly"
diff --git a/ci/docker-rust-nightly/Dockerfile b/ci/docker-rust-nightly/Dockerfile
new file mode 100644
index 000000000..24047c6d8
--- /dev/null
+++ b/ci/docker-rust-nightly/Dockerfile
@@ -0,0 +1,3 @@
+FROM rustlang/rust:nightly
+
+RUN cargo install --force clippy cargo-cov
diff --git a/ci/docker-rust-nightly/README.md b/ci/docker-rust-nightly/README.md
new file mode 100644
index 000000000..0406b0bac
--- /dev/null
+++ b/ci/docker-rust-nightly/README.md
@@ -0,0 +1,6 @@
+Docker image containing rust nightly and some preinstalled crates used in CI.
+
+This image may be manually updated by running `./build.sh` if you are a member
+of the [Solana Labs](https://hub.docker.com/u/solanalabs/) Docker Hub
+organization, but it is also automatically updated periodically by
+[this automation](https://buildkite.com/solana-labs/solana-ci-docker-rust-nightly).
diff --git a/ci/docker-rust-nightly/build.sh b/ci/docker-rust-nightly/build.sh
new file mode 100755
index 000000000..d65b4a92f
--- /dev/null
+++ b/ci/docker-rust-nightly/build.sh
@@ -0,0 +1,6 @@
+#!/bin/bash -ex
+
+cd "$(dirname "$0")"
+
+docker build -t solanalabs/rust-nightly .
+docker push solanalabs/rust-nightly
diff --git a/ci/test-nightly.sh b/ci/test-nightly.sh
index 119468de1..aed09ac08 100755
--- a/ci/test-nightly.sh
+++ b/ci/test-nightly.sh
@@ -18,7 +18,6 @@ _ cargo test --verbose --features unstable
 exit 0
 
 # Coverage disabled (see issue #433)
-_ cargo install --force cargo-cov
 _ cargo cov test
 _ cargo cov report