From a0c954ecf5d97efe81452656689ecbe6efd00a50 Mon Sep 17 00:00:00 2001 From: Bryan Stitt Date: Tue, 28 Mar 2023 12:39:13 -0700 Subject: [PATCH] rust 1.68.2 for updated rsa host key within cargo --- Dockerfile | 15 ++++++++------- rust-toolchain.toml | 2 +- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Dockerfile b/Dockerfile index 9e1a5400..8d99140a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,15 +1,13 @@ -# -# cargo-nextest -# We only pay the installation cost once, -# it will be cached from the second build onwards -# -FROM rust:1.67.1-bullseye AS builder +FROM rust:1.68.2-bullseye AS builder WORKDIR /app ENV CARGO_TERM_COLOR always # a next-generation test runner for Rust projects. +# We only pay the installation cost once, +# it will be cached from the second build onwards # TODO: more mount type cache? +# TODO: do this in a seperate FROM and COPY it in RUN --mount=type=cache,target=/usr/local/cargo/registry \ cargo install cargo-nextest @@ -18,7 +16,10 @@ RUN --mount=type=cache,target=/usr/local/cargo/registry \ ENV PATH /root/.foundry/bin:$PATH RUN curl -L https://foundry.paradigm.xyz | bash && foundryup -RUN apt-get update && apt-get install --yes librdkafka-dev && rm -rf /var/lib/apt/lists/* +# install web3-proxy system dependencies. most things are rust-only, but not everything +RUN apt-get update && \ + apt-get install --yes librdkafka-dev && \ + rm -rf /var/lib/apt/lists/* # copy the application COPY . . diff --git a/rust-toolchain.toml b/rust-toolchain.toml index 588ffd57..864d3c41 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.67.1" +channel = "1.68.2"