diff --git a/.circleci/config.yml b/.circleci/config.yml index e8b691da7a..6b96c83de4 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -122,7 +122,7 @@ jobs: rust-security: # Keep version in sync with rust-toolchain.toml docker: - - image: rust:1.71.1 + - image: rust:1.74.0 steps: - checkout - run: diff --git a/builder/Dockerfile b/builder/Dockerfile index 8de423454c..e780d998fb 100644 --- a/builder/Dockerfile +++ b/builder/Dockerfile @@ -34,7 +34,7 @@ RUN apt-get -y update && apt-get upgrade -y && apt-get install -y \ unzip \ zlib1g-dev -ENV RUST_VERSION 1.71.1 +ENV RUST_VERSION 1.74.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup diff --git a/rust-toolchain.toml b/rust-toolchain.toml index e6d1df7a25..639f4f17d9 100644 --- a/rust-toolchain.toml +++ b/rust-toolchain.toml @@ -1,2 +1,2 @@ [toolchain] -channel = "1.71.1" +channel = "1.74.0" diff --git a/securedrop/dockerfiles/focal/python3/DemoDockerfile b/securedrop/dockerfiles/focal/python3/DemoDockerfile index e34084c7f2..e4f898f2f1 100644 --- a/securedrop/dockerfiles/focal/python3/DemoDockerfile +++ b/securedrop/dockerfiles/focal/python3/DemoDockerfile @@ -14,7 +14,7 @@ RUN apt-get update && \ # 1) Download rustup-init and verify it matches hardcoded checksum # 2) Run it to install rustup and the rustc/cargo "minimal" toolchain # 3) Add `/opt/cargo/bin` to $PATH, which is where cargo & rustc are installed -ENV RUST_VERSION 1.71.1 +ENV RUST_VERSION 1.74.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup diff --git a/securedrop/dockerfiles/focal/python3/SlimDockerfile b/securedrop/dockerfiles/focal/python3/SlimDockerfile index 5beb6d199c..39eb54f459 100644 --- a/securedrop/dockerfiles/focal/python3/SlimDockerfile +++ b/securedrop/dockerfiles/focal/python3/SlimDockerfile @@ -15,7 +15,7 @@ RUN apt-get update && DEBIAN_FRONTEND=noninteractive TZ=Etc/UTC apt-get install # 1) Download rustup-init and verify it matches hardcoded checksum # 2) Run it to install rustup and the rustc/cargo "minimal" toolchain # 3) Add `/opt/cargo/bin` to $PATH, which is where cargo & rustc are installed -ENV RUST_VERSION 1.71.1 +ENV RUST_VERSION 1.74.0 ENV RUSTUP_VERSION 1.24.3 ENV RUSTUP_INIT_SHA256 3dc5ef50861ee18657f9db2eeb7392f9c2a6c95c90ab41e45ab4ca71476b4338 ENV RUSTUP_HOME /opt/rustup