Skip to content

Commit

Permalink
Updated Rust/Cargo toolchain to version 1.83.0-nightly (2024-09-10) +…
Browse files Browse the repository at this point in the history
… included the "rustfmt" component.
  • Loading branch information
danieltrick committed Sep 10, 2024
1 parent 8feb945 commit 8aa36cc
Show file tree
Hide file tree
Showing 3 changed files with 19 additions and 7 deletions.
12 changes: 10 additions & 2 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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.
11 changes: 7 additions & 4 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -1,15 +1,18 @@
# Debian Version
ARG DEBIAN_VERS=debian:sid-slim
ARG DEBIAN_VERS=debian:sid-20240904-slim

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
# Stage #1
# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
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 \
Expand All @@ -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/

# ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
Expand Down
3 changes: 2 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

0 comments on commit 8aa36cc

Please sign in to comment.