Added Rust/Cargo example project to the container image.

CHANGELOG.md

@@ -4,10 +4,13 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](http://keepachangelog.com/).
 
-## r4 - 2024-08-30
+## r4 - 2024-08-31
 
 ### Changed
-- Switched base system from `debian:bookworm-slim` to `bitnami/minideb:bookworm`
+- Switched base system from `debian:bookworm-slim` to `bitnami/minideb:bookworm`.
+
+### Added
+- Added example Rust/Cargo project to the container image.
 
 ## r3 - 2024-08-30
 

Dockerfile

@@ -18,8 +18,10 @@ RUN install_packages \
     rdfind
 
 # Install Rust
-RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \
-    && rdfind -makeresultsfile false -makesymlinks true /root
+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 \
+    && rdfind -makeresultsfile false -makesymlinks true /opt/rust/
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Stage #2
@@ -37,10 +39,21 @@ RUN install_packages \
     pkg-config
 
 # Copy Rust/Cargo files
-COPY --from=build /root/ /root/
+COPY --from=build /opt/rust/ /opt/rust/
 
-# Create symlinks
-RUN ln -s -t /usr/local/bin /root/.cargo/bin/*
+# Copy entry-point script
+COPY bin/entry-point.sh /opt/rust/entry-point.sh
 
-# Start the shell
-ENTRYPOINT ["/bin/bash"]
+# Copy example project
+COPY src/example/ /var/opt/rust/src/
+
+# Set up environment
+ENV RUSTUP_HOME=/opt/rust/rustup
+ENV CARGO_HOME=/opt/rust/cargo
+ENV CARGO_TARGET_DIR=/var/tmp/rust/target
+
+# Working directory
+WORKDIR /var/opt/rust/src
+
+# Entry point
+ENTRYPOINT ["/opt/rust/entry-point.sh"]

README.md

@@ -12,5 +12,5 @@ Version history
 
 | **Release** | **Date**   | **Base system**                | **Rust toolchain** | **TPM2 Software Stack** |
 | ----------- | ---------- | ------------------------------ | ------------------ | ----------------------- |
-| r4          | 2024-08-30 | Minideb "Bookworm", 2024-08-30 | 1.80.0             | 3.2.1-3                 |
+| r4          | 2024-08-31 | Minideb "Bookworm", 2024-08-31 | 1.80.0             | 3.2.1-3                 |
 | r3          | 2024-08-30 | Debian 12, 2024-08-12          | 1.80.0             | 3.2.1-3                 |

bin/entry-point.sh

@@ -0,0 +1,4 @@
+#!/bin/bash
+. "${CARGO_HOME}/env"
+set -x
+cargo "${@:-build}"

src/example/Cargo.toml

@@ -0,0 +1,6 @@
+[package]
+name = "src"
+version = "0.1.0"
+edition = "2021"
+
+[dependencies]

src/example/src/main.rs

@@ -0,0 +1,3 @@
+fn main() {
+    println!("Hello, world!");
+}