From 421a803e6ae8a2fbf285c252f665b88bbd74ba26 Mon Sep 17 00:00:00 2001
From: Daniel Trick <daniel.trick@sit.fraunhofer.de>
Date: Fri, 30 Aug 2024 16:16:36 +0200
Subject: [PATCH] Switched base system from "debian:bookworm-slim" to
 "bitnami/minideb:bookworm".

---
 CHANGELOG.md |  5 +++++
 Dockerfile   | 38 +++++++++++++++++++-------------------
 README.md    |  7 ++++---
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 3af3f08..3c0bd65 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,6 +4,11 @@ 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
+
+### Changed
+- Switched base system from `debian:bookworm-slim` to `bitnami/minideb:bookworm`
+
 ## r3 - 2024-08-30
 
 ### Changed
diff --git a/Dockerfile b/Dockerfile
index 3610e4e..f07cfbd 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,22 +1,21 @@
 # Debian Version
-ARG DEBIAN_VERS=bookworm-20240812-slim
+ARG DEBIAN_VERS=bitnami/minideb:bookworm
 
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Stage #1
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-FROM debian:$DEBIAN_VERS AS build
+FROM $DEBIAN_VERS AS build
 
 # Rust version
 ARG RUST_VERSION=1.80.0
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install dependencies
-RUN apt-get update \
-    && apt-get install -y \
-       curl \
-       rdfind \
-    && rm -vrf /var/lib/apt/lists/* /var/cache/apt/*
+# Install build dependencies
+RUN install_packages \
+    ca-certificates \
+    curl \
+    rdfind
 
 # Install Rust
 RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=${RUST_VERSION} --profile=minimal -y \
@@ -25,22 +24,23 @@ RUN curl https://sh.rustup.rs -sSf | sh -s -- --default-toolchain=${RUST_VERSION
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 # Stage #2
 # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-FROM debian:$DEBIAN_VERS
+FROM $DEBIAN_VERS
 
 ENV DEBIAN_FRONTEND=noninteractive
 
-# Install dependencies
-RUN apt-get update \
-    && apt-get install --no-install-recommends -y \
-       ca-certificates \
-       gcc \
-       libclang-dev \
-       libtss2-dev \
-       pkg-config \
-    && rm -vrf /var/lib/apt/lists/* /var/cache/apt/*
+# Install runtime dependencies
+RUN install_packages \
+    ca-certificates \
+    gcc \
+    libclang-dev \
+    libtss2-dev \
+    pkg-config
 
 # Copy Rust/Cargo files
 COPY --from=build /root/ /root/
 
+# Create symlinks
+RUN ln -s -t /usr/local/bin /root/.cargo/bin/*
+
 # Start the shell
-ENTRYPOINT ["/bin/bash", "-l"]
+ENTRYPOINT ["/bin/bash"]
diff --git a/README.md b/README.md
index df230e0..6ecb50b 100644
--- a/README.md
+++ b/README.md
@@ -10,6 +10,7 @@ Ready to use development environment with [Rust/Cargo](https://www.rust-lang.org
 Version history
 ---------------
 
-| **Release** | **Date**   | **Base system**       | **Rust toolchain** | **TPM2 Software Stack** |
-| ----------- | ---------- | --------------------- | ------------------ | ----------------------- |
-| r3          | 2024-08-30 | Debian 12, 2024-08-12 | 1.80.0             | 3.2.1-3                 |
+| **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                 |
+| r3          | 2024-08-30 | Debian 12, 2024-08-12          | 1.80.0             | 3.2.1-3                 |