From ead25c76fb78977a1eaeaebce3ea059c87a3df3d Mon Sep 17 00:00:00 2001 From: Enderson Maia Date: Mon, 25 Aug 2025 09:27:53 -0300 Subject: [PATCH 1/7] feat(cpp): use Debian 13 (trixie) --- cpp/Dockerfile | 64 ++++++++++++++++++++++++++++++++++++++++---------- 1 file changed, 51 insertions(+), 13 deletions(-) diff --git a/cpp/Dockerfile b/cpp/Dockerfile index 6c182ea..6938129 100644 --- a/cpp/Dockerfile +++ b/cpp/Dockerfile @@ -2,25 +2,56 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z +ARG DEBIAN_TAG=trixie-20250908-slim@sha256:c2880112cc5c61e1200c26f106e4123627b49726375eb5846313da9cca117337 +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z + +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config +ARG APT_UPDATE_SNAPSHOT +COPY < Date: Mon, 25 Aug 2025 09:30:34 -0300 Subject: [PATCH 2/7] feat(cpp-low-level): use Debian 13 (trixie) --- cpp-low-level/Dockerfile | 88 +++++++++++++++++++++++++++++++--------- 1 file changed, 68 insertions(+), 20 deletions(-) diff --git a/cpp-low-level/Dockerfile b/cpp-low-level/Dockerfile index 1a79064..6e28209 100644 --- a/cpp-low-level/Dockerfile +++ b/cpp-low-level/Dockerfile @@ -1,27 +1,64 @@ # syntax=docker.io/docker/dockerfile:1 -ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1 # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z +ARG DEBIAN_TAG=trixie-20250908-slim@sha256:c2880112cc5c61e1200c26f106e4123627b49726375eb5846313da9cca117337 +ARG MACHINE_GUEST_TOOLS_VERSION=0.17.1 + +FROM scratch AS machine-guest-tools-checksum +COPY < Date: Mon, 25 Aug 2025 09:36:45 -0300 Subject: [PATCH 3/7] feat(go): use Debian 13 (trixie) --- go/Dockerfile | 95 +++++++++++++++++++++++++++++++-------------------- 1 file changed, 58 insertions(+), 37 deletions(-) diff --git a/go/Dockerfile b/go/Dockerfile index 7434d05..782c7c8 100644 --- a/go/Dockerfile +++ b/go/Dockerfile @@ -2,94 +2,115 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z - -################################################################################ -# riscv64 base stage -FROM --platform=linux/riscv64 ubuntu:${UBUNTU_TAG} AS base-riscv64 +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z +ARG DEBIAN_TAG=trixie-20250908-slim@sha256:c2880112cc5c61e1200c26f106e4123627b49726375eb5846313da9cca117337 +ARG GO_VERSION=1.24.6 +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config ARG APT_UPDATE_SNAPSHOT -ARG DEBIAN_FRONTEND=noninteractive -RUN < Date: Mon, 25 Aug 2025 09:40:07 -0300 Subject: [PATCH 4/7] feat(lua): use Debian 13 (trixie) --- lua/Dockerfile | 76 +++++++++++++++++++++++++++++++++++++++----------- 1 file changed, 59 insertions(+), 17 deletions(-) diff --git a/lua/Dockerfile b/lua/Dockerfile index f96832c..c4a48a4 100644 --- a/lua/Dockerfile +++ b/lua/Dockerfile @@ -2,25 +2,56 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z +ARG DEBIAN_TAG=trixie-20250908-slim@sha256:c2880112cc5c61e1200c26f106e4123627b49726375eb5846313da9cca117337 +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z + +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config +ARG APT_UPDATE_SNAPSHOT +COPY < Date: Mon, 25 Aug 2025 09:42:12 -0300 Subject: [PATCH 5/7] feat(python): use Debian 13 (trixie) --- python/.dockerignore | 2 + python/Dockerfile | 93 +++++++++++++++++++++++++++++++------------- 2 files changed, 69 insertions(+), 26 deletions(-) create mode 100644 python/.dockerignore diff --git a/python/.dockerignore b/python/.dockerignore new file mode 100644 index 0000000..a8c6a37 --- /dev/null +++ b/python/.dockerignore @@ -0,0 +1,2 @@ +.cartesi +.venv diff --git a/python/Dockerfile b/python/Dockerfile index 7ffee8f..a98b4e9 100644 --- a/python/Dockerfile +++ b/python/Dockerfile @@ -2,64 +2,105 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z +ARG PYTHON_VERSION=3.13.6 + +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config +ARG APT_UPDATE_SNAPSHOT +COPY < Date: Mon, 25 Aug 2025 09:43:03 -0300 Subject: [PATCH 6/7] feat(ruby): use Debian 13 (trixie) --- ruby/.dockerignore | 1 + ruby/Dockerfile | 88 ++++++++++++++++++++++++++++++++++------------ 2 files changed, 66 insertions(+), 23 deletions(-) diff --git a/ruby/.dockerignore b/ruby/.dockerignore index 82b4d6a..a647c70 100644 --- a/ruby/.dockerignore +++ b/ruby/.dockerignore @@ -1 +1,2 @@ .cartesi +.bundle diff --git a/ruby/Dockerfile b/ruby/Dockerfile index 498eda4..f6e83ea 100644 --- a/ruby/Dockerfile +++ b/ruby/Dockerfile @@ -2,37 +2,69 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z +ARG RUBY_VERSION=3.4.5 + +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config +ARG APT_UPDATE_SNAPSHOT +COPY < Date: Mon, 25 Aug 2025 09:43:32 -0300 Subject: [PATCH 7/7] feat(rust): use Debian 13 (trixie) --- rust/Dockerfile | 117 +++++++++++++++++++++++++----------------------- 1 file changed, 61 insertions(+), 56 deletions(-) diff --git a/rust/Dockerfile b/rust/Dockerfile index 3aa9593..c3699de 100644 --- a/rust/Dockerfile +++ b/rust/Dockerfile @@ -2,109 +2,114 @@ # This enforces that the packages downloaded from the repositories are the same # for the defined date, no matter when the image is built. -ARG UBUNTU_TAG=noble-20250910 -ARG APT_UPDATE_SNAPSHOT=20250915T030400Z - -################################################################################ -# riscv64 base stage -FROM --platform=linux/riscv64 ubuntu:${UBUNTU_TAG} AS base-riscv64 +ARG APT_UPDATE_SNAPSHOT=20250908T144407Z +ARG DEBIAN_TAG=trixie-20250908-slim@sha256:c2880112cc5c61e1200c26f106e4123627b49726375eb5846313da9cca117337 +ARG RUST_VERSION=1.89 +# Configure apt to use snapshot.debian.org +FROM scratch AS apt-config ARG APT_UPDATE_SNAPSHOT -ARG DEBIAN_FRONTEND=noninteractive -RUN <&2 "unsupported architecture: ${dpkgArch}"; exit 1 ;; -esac -url="https://static.rust-lang.org/rustup/archive/1.27.1/${rustArch}/rustup-init" -curl -fsSL -O "$url" -echo "${rustupSha256} *rustup-init" | sha256sum -c - -chmod +x rustup-init -./rustup-init -y --no-modify-path --profile minimal --default-toolchain $RUST_VERSION --default-host ${rustArch} -rm rustup-init -chmod -R a+w $RUSTUP_HOME $CARGO_HOME -rustup --version -cargo --version -rustc --version -EOF - -RUN rustup target add riscv64gc-unknown-linux-gnu - WORKDIR /opt/cartesi/dapp COPY . . -RUN cargo build --release + +RUN <