From cbdcf9be1bd02508ff63b959f9009b4411fe1533 Mon Sep 17 00:00:00 2001 From: Varun Dhananjaya Date: Thu, 7 Nov 2024 17:06:56 -0500 Subject: [PATCH] Upgrade to Rust 1.82 Summary: Rust 1.81 introduced new [lifetime rules](https://github.com/rust-lang/rust/pull/117967), which opaque-ke, a crate we depend on, violated. The maintainers of that crate have introduced a new version that satisifies these new rules, and we have upgraded to this version in D13895. Now that we've upgraded the dependency, we should bump Rust to the latest stable version. Depends on D13895 Test Plan: All crates build locally and in Docker (CI) Reviewers: will, bartek Subscribers: --- keyserver/Dockerfile | 2 +- rust-toolchain.toml | 2 +- services/backup/Dockerfile | 2 +- services/blob/Dockerfile | 2 +- services/commtest/Dockerfile | 2 +- services/feature-flags/Dockerfile | 2 +- services/identity/Dockerfile | 2 +- services/reports/Dockerfile | 2 +- services/tunnelbroker/Dockerfile | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) diff --git a/keyserver/Dockerfile b/keyserver/Dockerfile index 2f573f53f7..fa34ec6010 100644 --- a/keyserver/Dockerfile +++ b/keyserver/Dockerfile @@ -88,7 +88,7 @@ RUN mkdir /home/comm/backups # Install Rust and add Cargo's bin directory to the $PATH environment variable RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y \ - --default-toolchain 1.76 + --default-toolchain 1.82 ENV PATH /home/comm/.cargo/bin:$PATH #------------------------------------------------------------------------------- diff --git a/rust-toolchain.toml b/rust-toolchain.toml index af663bde66..5fce226f0a 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,3 +1,3 @@ [toolchain] -channel = "1.76" +channel = "1.82" profile = "default" diff --git a/services/backup/Dockerfile b/services/backup/Dockerfile index ebc8004d3c..5c3b9cc3cd 100644 --- a/services/backup/Dockerfile +++ b/services/backup/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/blob/Dockerfile b/services/blob/Dockerfile index 18735a8180..e057d15c7d 100644 --- a/services/blob/Dockerfile +++ b/services/blob/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/commtest/Dockerfile b/services/commtest/Dockerfile index c6138d1db4..a8598108aa 100644 --- a/services/commtest/Dockerfile +++ b/services/commtest/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye +FROM rust:1.82-bullseye RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/feature-flags/Dockerfile b/services/feature-flags/Dockerfile index 198fc35e1e..b59be0127b 100644 --- a/services/feature-flags/Dockerfile +++ b/services/feature-flags/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/identity/Dockerfile b/services/identity/Dockerfile index 6073c91d99..67709ebf25 100644 --- a/services/identity/Dockerfile +++ b/services/identity/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/reports/Dockerfile b/services/reports/Dockerfile index 2d80bebb4f..4f8ee961f4 100644 --- a/services/reports/Dockerfile +++ b/services/reports/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \ diff --git a/services/tunnelbroker/Dockerfile b/services/tunnelbroker/Dockerfile index 7191452cfb..24cb27eea5 100644 --- a/services/tunnelbroker/Dockerfile +++ b/services/tunnelbroker/Dockerfile @@ -1,4 +1,4 @@ -FROM rust:1.76-bullseye as builder +FROM rust:1.82-bullseye as builder RUN apt-get update && DEBIAN_FRONTEND=noninteractive apt-get install -y \ build-essential cmake git libgtest-dev libssl-dev zlib1g-dev \