vw_small

commit f24e754ff7ce071985a7e77f6c82b7fe4fbb0283
parent 7983ce4f13c0b38e42dea9c6ced5adc6c208bec0
Author: Daniel García <dani-garcia@users.noreply.github.com>
Date:   Wed, 13 Jun 2018 12:08:06 +0200

Merge pull request #41 from mprasil/toolchain_build

Use proper toolchain in Dockerfile
Diffstat:
M
Dockerfile
 | 
3
++-

1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Dockerfile b/Dockerfile
@@ -31,7 +31,7 @@ RUN git config --global url."https://github.com/".insteadOf ssh://git@github.com
 ########################## BUILD IMAGE  ##########################
 # We need to use the Rust build image, because
 # we need the Rust compiler and Cargo tooling
-FROM rustlang/rust:nightly as build
+FROM rust as build
 
 # Using bundled SQLite, no need to install it
 # RUN apt-get update && apt-get install -y\
@@ -46,6 +46,7 @@ WORKDIR /app
 # Copies over *only* your manifests and vendored dependencies
 COPY ./Cargo.* ./
 COPY ./libs ./libs
+COPY ./rust-toolchain ./rust-toolchain
 
 # Builds your dependencies and removes the
 # dummy project, except the target folder