diff --git a/CHANGELOG.md b/CHANGELOG.md index 22b5774..d25bc25 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,11 +4,19 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/). -## r2 - 2024-09-05 +## Unstable/Sid r3 - 2024-09-10 + +### Added +- Included the `rustfmt` component with the Rust installation. + +### Changed +- Updated Rust/Cargo toolchain to version 1.83.0-nightly (2024-09-10). + +## Unstable/Sid r2 - 2024-09-05 ### Changed - Updated Rust/Cargo toolchain to version 1.81.0 (2024-09-05). -## r1 - 2024-09-03 +## Unstable/Sid r1 - 2024-09-03 - This is the first public release of this project. diff --git a/Dockerfile b/Dockerfile index 91a59bf..f025cd8 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,5 +1,5 @@ # Debian Version -ARG DEBIAN_VERS=debian:sid-slim +ARG DEBIAN_VERS=debian:sid-20240904-slim # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ # Stage #1 @@ -7,9 +7,12 @@ ARG DEBIAN_VERS=debian:sid-slim FROM $DEBIAN_VERS AS build # Rust version -ARG RUST_VERSION=1.81.0 +ARG RUST_VERSION=nightly-2024-09-10 +# Set up environment ENV DEBIAN_FRONTEND=noninteractive +ENV CARGO_HOME=/opt/rust/cargo +ENV RUSTUP_HOME=/opt/rust/rustup # Install build dependencies RUN apt-get update -qq \ @@ -21,8 +24,8 @@ RUN apt-get update -qq \ # Install Rust RUN curl https://sh.rustup.rs -sSf | \ - CARGO_HOME=/opt/rust/cargo RUSTUP_HOME=/opt/rust/rustup \ - sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \ + sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \ + && ${CARGO_HOME}/bin/rustup component add rustfmt \ && rdfind -makeresultsfile false -makesymlinks true /opt/rust/ # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ diff --git a/README.md b/README.md index db99540..d1a31e8 100644 --- a/README.md +++ b/README.md @@ -12,5 +12,6 @@ Version history | **Release** | **Date** | **Base system** | **Rust toolchain** | **TPM2 Software Stack** | | ----------- | ---------- | --------------------------------- | ------------------ | ----------------------- | -| r2 | 2024-09-05 | Debian Unstable (Sid), 2024-09-05 | 1.81.0 | 4.1.3-1 | +| r3 | 2024-09-10 | Debian Unstable (Sid), 2024-09-04 | 1.83.0-nightly | 4.1.3-1 | +| r2 | 2024-09-05 | Debian Unstable (Sid), 2024-09-04 | 1.81.0 | 4.1.3-1 | | r1 | 2024-09-03 | Debian Unstable (Sid), 2024-08-13 | 1.80.0 | 4.1.3-1 |