From 882213e9d8159b6a26df3c170afd09eef9d8fbd8 Mon Sep 17 00:00:00 2001
From: Enderson Maia <endersonmaia@gmail.com>
Date: Wed, 22 Oct 2025 09:41:36 -0300
Subject: [PATCH] chore: use apt --snapshot for reproducibility

Also did:

- multi stage Dockerfile with common base image to improve parallelism
- build-args on top of the file for easy maintenance
- change container image from riscv64/ubuntu to ubuntu
---
 rootfs.Dockerfile | 42 +++++++++++++++++++++++++++++++-----------
 1 file changed, 31 insertions(+), 11 deletions(-)

diff --git a/rootfs.Dockerfile b/rootfs.Dockerfile
index 187f3d0..222b116 100644
--- a/rootfs.Dockerfile
+++ b/rootfs.Dockerfile
@@ -1,15 +1,35 @@
+ARG UBUNTU_TAG=noble-20251001
+ARG APT_UPDATE_SNAPSHOT=20251022T030400Z
+ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
+ARG DEBIAN_FRONTEND=noninteractive
+
+################################
+# base
+FROM --platform=linux/riscv64 ubuntu:${UBUNTU_TAG} as base
+
+ARG APT_UPDATE_SNAPSHOT
+ARG DEBIAN_FRONTEND
+RUN <<EOF
+set -eu
+apt-get update
+apt-get install -y --no-install-recommends ca-certificates
+apt-get update --snapshot=${APT_UPDATE_SNAPSHOT}
+apt-get remove -y --purge ca-certificates
+apt-get autoremove -y --purge
+EOF
+
 ################################
 # honeypot builder
-FROM --platform=linux/riscv64 riscv64/ubuntu:noble-20250404 AS builder
+FROM base AS builder
 
 # Install build essential
-RUN apt-get update && \
-    DEBIAN_FRONTEND=noninteractive apt-get install -y --no-install-recommends \
-    busybox-static=1:1.36.1-6ubuntu3.1 \
-    build-essential=12.10ubuntu1
+ARG DEBIAN_FRONTEND
+RUN apt-get install -y --no-install-recommends \
+    build-essential \
+    busybox-static
 
 # Install libcmt
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
+ARG MACHINE_GUEST_TOOLS_VERSION
 ADD https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb /tmp/
 RUN dpkg -i /tmp/machine-guest-tools_riscv64.deb && \
     rm -f /tmp/machine-guest-tools_riscv64.deb
@@ -25,15 +45,15 @@ RUN make HONEYPOT_CONFIG=${HONEYPOT_CONFIG}
 
 ################################
 # rootfs builder
-FROM --platform=linux/riscv64 riscv64/ubuntu:noble-20250404
+FROM base
 
 # Install dependencies
-RUN apt-get update && \
-    apt-get install -y --no-install-recommends \
-    busybox-static=1:1.36.1-6ubuntu3.1
+ARG DEBIAN_FRONTEND
+RUN apt-get install -y --no-install-recommends \
+    busybox-static
 
 # Install guest tools
-ARG MACHINE_GUEST_TOOLS_VERSION=0.17.2
+ARG MACHINE_GUEST_TOOLS_VERSION
 ADD https://github.com/cartesi/machine-guest-tools/releases/download/v${MACHINE_GUEST_TOOLS_VERSION}/machine-guest-tools_riscv64.deb /tmp/
 RUN dpkg -i /tmp/machine-guest-tools_riscv64.deb && \
     rm -f /tmp/machine-guest-tools_riscv64.deb