From 520645d53f16abd7f7f25d468c412028f68ccffd Mon Sep 17 00:00:00 2001 From: Yijie Shen Date: Tue, 22 Jun 2021 11:05:45 +0800 Subject: [PATCH 1/2] Use Rust nightly in docker for integration test --- dev/docker/ballista-base.dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dev/docker/ballista-base.dockerfile b/dev/docker/ballista-base.dockerfile index 31620b38cf39..ab5d9a172229 100644 --- a/dev/docker/ballista-base.dockerfile +++ b/dev/docker/ballista-base.dockerfile @@ -96,4 +96,6 @@ RUN cargo install cargo-build-deps # prepare toolchain RUN rustup update && \ + rustup toolchain install nightly-2021-05-10 && \ + rustup default nightly-2021-05-10 && \ rustup component add rustfmt \ No newline at end of file From 95e0a1a64e054e144ebfd6a9a4cfcdbafa47ce94 Mon Sep 17 00:00:00 2001 From: Yijie Shen Date: Tue, 22 Jun 2021 15:05:22 +0800 Subject: [PATCH 2/2] Use latest rust stable for docker image --- dev/docker/ballista-base.dockerfile | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/dev/docker/ballista-base.dockerfile b/dev/docker/ballista-base.dockerfile index ab5d9a172229..4dc7a065e690 100644 --- a/dev/docker/ballista-base.dockerfile +++ b/dev/docker/ballista-base.dockerfile @@ -23,7 +23,7 @@ # Base image extends debian:buster-slim -FROM rust:1.51.0-buster AS builder +FROM rust:1.53.0-buster AS builder RUN apt update && apt -y install musl musl-dev musl-tools libssl-dev openssl @@ -96,6 +96,4 @@ RUN cargo install cargo-build-deps # prepare toolchain RUN rustup update && \ - rustup toolchain install nightly-2021-05-10 && \ - rustup default nightly-2021-05-10 && \ rustup component add rustfmt \ No newline at end of file