Skip to content

Commit

Permalink
Switched base system from "debian:bookworm-slim" to "bitnami/minideb:…
Browse files Browse the repository at this point in the history
…bookworm".
  • Loading branch information
danieltrick committed Aug 30, 2024
1 parent 1c660b1 commit 421a803
Show file tree
Hide file tree
Showing 3 changed files with 28 additions and 22 deletions.
5 changes: 5 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
38 changes: 19 additions & 19 deletions Dockerfile
Original file line number Diff line number Diff line change
@@ -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 \
Expand All @@ -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"]
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -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 |

0 comments on commit 421a803

Please sign in to comment.