From b62359c172a1388a02a38af814a239db8c64d787 Mon Sep 17 00:00:00 2001 From: projectmoon Date: Tue, 20 Apr 2021 21:35:12 +0000 Subject: [PATCH] Update to rust 1.51 with rustup, for zeroconf 0.4 which requires const generics. --- Cargo.lock | 4 ++-- Cargo.toml | 2 +- Dockerfile | 5 +++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 9844387..ef7ded8 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2634,9 +2634,9 @@ dependencies = [ [[package]] name = "zerocopy" -version = "0.3.0" +version = "0.4.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "6580539ad917b7c026220c4b3f2c08d52ce54d6ce0dc491e66002e35388fab46" +checksum = "ab9379fdcbd16727ce6f7f098154c35d303f092ba4c8e20719f584ad29b8aa47" dependencies = [ "byteorder", "zerocopy-derive", diff --git a/Cargo.toml b/Cargo.toml index 6b67770..fbd213a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -24,7 +24,7 @@ dirs = "3.0" indoc = "1.0" combine = "4.5" sled = "0.34" -zerocopy = "0.3" +zerocopy = "0.4" byteorder = "1.3" futures = "0.3" memmem = "0.1" diff --git a/Dockerfile b/Dockerfile index b77d035..d7bf3fb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,8 +1,9 @@ # Builder image with development dependencies. FROM bougyman/voidlinux:glibc as builder RUN xbps-install -Syu -RUN xbps-install -Sy base-devel rust cargo cmake wget gnupg +RUN xbps-install -Sy base-devel rustup cargo cmake wget gnupg RUN xbps-install -Sy openssl-devel libstdc++-devel +RUN rustup-init -qy # Install tini for signal processing and zombie killing ENV TINI_VERSION v0.19.0 @@ -16,7 +17,7 @@ RUN chmod +x /usr/local/bin/tini RUN mkdir -p /root/src WORKDIR /root/src ADD . ./ -RUN cargo build --release +RUN . /root/.cargo/env && cargo build --release # Final image FROM bougyman/voidlinux:tiny