From 78a2acb65965155daac7024d5d0a02df191eaf8e Mon Sep 17 00:00:00 2001
From: Renan Santos <renan.061@gmail.com>
Date: Thu, 6 Jun 2024 14:38:47 -0300
Subject: [PATCH] feat: update the Dockerfile with emulator dependencies

- Adds linux.bin and rootfs.ext2 download to the emulator stage.
- Adds a emulator-devel stage that install libcmt and xgenext2fs.
- Configures the CI image to use CGO.
- Refactors the Dockerfile to improve readability.
---
 .github/workflows/build.yml           |   6 +-
 .github/workflows/clean-up-images.yml |   2 +-
 build/Dockerfile                      | 452 +++++++++++++++++---------
 build/docker-bake.override.hcl        |   4 +-
 build/docker-bake.platforms.hcl       |   6 +-
 internal/node/machinehash_test.go     |   3 +-
 6 files changed, 308 insertions(+), 165 deletions(-)

diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
index f0b157164..ba1b16077 100644
--- a/.github/workflows/build.yml
+++ b/.github/workflows/build.yml
@@ -140,7 +140,7 @@ jobs:
         uses: docker/metadata-action@v5
         with:
           images: |
-            name=ghcr.io/cartesi/rollups-node-ci-base
+            name=ghcr.io/cartesi/rollups-node-ci
           tags: |
             type=semver,pattern={{version}}
             type=ref,event=branch
@@ -162,7 +162,7 @@ jobs:
             ./docker-bake.hcl
             ${{ steps.docker_meta.outputs.bake-file }}
             ./docker-bake.platforms.hcl
-          targets: rollups-node-ci-base
+          targets: rollups-node-ci
           push: true
           project: ${{ vars.DEPOT_PROJECT }}
           workdir: build
@@ -174,7 +174,7 @@ jobs:
   test-go:
     runs-on: ubuntu-22.04
     container:
-      image: ghcr.io/cartesi/rollups-node-ci-base:${{needs.build-ci-base.outputs.output}}
+      image: ghcr.io/cartesi/rollups-node-ci:${{needs.build-ci-base.outputs.output}}
     needs:
       - build-ci-base
     steps:
diff --git a/.github/workflows/clean-up-images.yml b/.github/workflows/clean-up-images.yml
index d3d030c78..acccfeb41 100644
--- a/.github/workflows/clean-up-images.yml
+++ b/.github/workflows/clean-up-images.yml
@@ -17,7 +17,7 @@ jobs:
       matrix:
         image:
           - rollups-node
-          - rollups-node-ci-base
+          - rollups-node-ci
     steps:
       - uses: vlaurin/action-ghcr-prune@v0.6.0
         with:
diff --git a/build/Dockerfile b/build/Dockerfile
index a65da65e6..6a9ffb7c1 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -4,19 +4,19 @@
 # syntax=docker.io/docker/dockerfile:1
 
 # This dockerfile contains multiple stages to build three final targets.
-# The file was split in a section for each final target.
 
-# Version config that should be set in the bake file.
+# Version configuration that should be set in the bake file.
 ARG BASE_IMAGE
 ARG RUST_VERSION
 ARG GO_VERSION
 ARG FOUNDRY_NIGHTLY_VERSION
-ARG MACHINE_EMULATOR_VERSION
-ARG ROOTFS_VERSION
-ARG LINUX_VERSION
-ARG LINUX_KERNEL_VERSION
 ARG ROM_VERSION
 ARG ROLLUPS_NODE_VERSION
+ARG MACHINE_EMULATOR_VERSION
+ARG MACHINE_TOOLS_VERSION
+ARG MACHINE_IMAGE_KERNEL_VERSION
+ARG MACHINE_KERNEL_VERSION
+ARG MACHINE_XGENEXT2FS_VERSION
 
 # Build directories.
 ARG SNAPSHOT_BUILD_PATH=/build/snapshot
@@ -24,177 +24,320 @@ ARG DEVNET_BUILD_PATH=/build/devnet
 ARG RUST_BUILD_PATH=/build/rollups-node/rust
 ARG GO_BUILD_PATH=/build/rollups-node/go
 
-# Runtime dir for the cartesi-machine snapshot.
+# Runtime directory for the cartesi-machine snapshot.
 ARG SNAPSHOT_RUNTIME_PATH=/usr/share/cartesi/snapshot
 
-####################################################################################################
-# STAGE: emulator-base
+# =============================================================================
+# STAGE: emulator
+#
+# - Install ca-certificates and curl (setup).
+# - Install the machine-emulator.
+# - Download linux.bin.
+# - Download rootfs.ext2.
 #
-# This stage creates a base-image with the Cartesi machine emulator.
-# The result is used as the base for the snapshot and the node targets.
-# We do this instead of using the cartesi/machine-emulator image to have control over the distro
-# used by the base image.
-FROM ${BASE_IMAGE} as emulator-base
+# NOTE: We do not use the cartesi/machine-emulator image to have control over
+# the distro used by the base image.
+# =============================================================================
+
+FROM ${BASE_IMAGE} as emulator
 
-# Install machine-emulator
 ARG MACHINE_EMULATOR_VERSION
+ARG MACHINE_TOOLS_VERSION
+ARG MACHINE_IMAGE_KERNEL_VERSION
+ARG MACHINE_KERNEL_VERSION
+ARG DEBIAN_FRONTEND=noninteractive
+
+# Install ca-certificates and curl (setup).
+RUN <<EOF
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends ca-certificates curl
+EOF
+
+# Install the cartesi-machine (cartesi/machine-emulator).
+RUN <<EOF
+    set -e
+    ARCH=$(dpkg --print-architecture)
+    URL=https://github.com/cartesi/machine-emulator/releases/download
+    VERSION=v${MACHINE_EMULATOR_VERSION}
+    ARTIFACT=cartesi-machine-${VERSION}_${ARCH}.deb
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./cartesi-machine.deb
+    apt-get install -y ./cartesi-machine.deb
+    rm ./cartesi-machine.deb
+EOF
+
+# Configure cartesi user and cartesi group.
+RUN <<EOF
+    set -e
+    addgroup --system --gid 102 cartesi
+    adduser --system --uid 102 \
+        --disabled-login \
+        --gecos "cartesi user" \
+        --home /nonexistent \
+        --ingroup cartesi \
+        --no-create-home \
+        --shell /bin/false \
+        cartesi
+EOF
+
+# Download linux.bin (cartesi/image-kernel).
+RUN <<EOF
+    set -e
+    URL=https://github.com/cartesi/image-kernel/releases/download
+    VERSION=v${MACHINE_IMAGE_KERNEL_VERSION}
+    ARTIFACT=linux-${MACHINE_KERNEL_VERSION}-ctsi-1-${VERSION}.bin
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./linux.bin
+    mv ./linux.bin /usr/share/cartesi-machine/images
+EOF
+
+# Download rootfs.ext2 (cartesi/machine-emulator-tools).
+RUN <<EOF
+    set -e
+    URL=https://github.com/cartesi/machine-emulator-tools/releases/download
+    VERSION=v${MACHINE_TOOLS_VERSION}
+    ARTIFACT=rootfs-tools-${VERSION}.ext2
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./rootfs.ext2
+    mv ./rootfs.ext2 /usr/share/cartesi-machine/images
+EOF
+
+# Clean up.
+RUN <<EOF
+    rm -rf /var/lib/apt/lists/*
+EOF
+
+# =============================================================================
+# STAGE: emulator-devel
+#
+# - Install libarchive13 (setup -- required by xgenext2fs).
+# - Install libcmt.
+# - Install xgenext2fs.
+#
+# IMPORTANT: Only works with the linux/amd64 platform!
+#            (libarchive13 is amd64 exclusive.)
+# =============================================================================
+
+FROM emulator as emulator-devel
+
+ARG MACHINE_TOOLS_VERSION
+ARG MACHINE_XGENEXT2FS_VERSION
 ARG DEBIAN_FRONTEND=noninteractive
+
+# Install libarchive13 (setup -- required by xgenext2fs).
+RUN <<EOF
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends libarchive13
+EOF
+
+# Install libcmt (cartesi/machine-emulator-tools).
+RUN <<EOF
+    set -e
+    URL=https://github.com/cartesi/machine-emulator-tools/releases/download
+    VERSION=v${MACHINE_TOOLS_VERSION}
+    ARTIFACT=libcmt-${VERSION}-dev.deb
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./libcmt.deb
+    apt-get install -y ./libcmt.deb
+    rm ./libcmt.deb
+    mv /usr/riscv64-linux-gnu/include/libcmt /usr/include/
+    mv /usr/riscv64-linux-gnu/lib/libcmt.a /usr/lib/
+    rm -rf /usr/riscv64-linux-gnu
+EOF
+
+# Install xgenext2fs (cartesi/genext2fs).
 RUN <<EOF
-set -e
-apt-get update
-apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl
-ARCH=$(dpkg --print-architecture)
-curl -fsSL https://github.com/cartesi/machine-emulator/releases/download/v${MACHINE_EMULATOR_VERSION}/cartesi-machine-v${MACHINE_EMULATOR_VERSION}_${ARCH}.deb -o ./cartesi-machine.deb
-apt-get install -y ./cartesi-machine.deb
-rm ./cartesi-machine.deb
-rm -rf /var/lib/apt/lists/*
+    set -e
+    URL=https://github.com/cartesi/genext2fs/releases/download
+    VERSION=v${MACHINE_XGENEXT2FS_VERSION}
+    ARTIFACT=xgenext2fs_amd64.deb
+    curl -fsSL ${URL}/${VERSION}/${ARTIFACT} -o ./xgenext2fs.deb
+    apt-get install -y ./xgenext2fs.deb
+    rm ./xgenext2fs.deb
 EOF
 
-# Configure cartesi user and group.
+# Clean up.
 RUN <<EOF
-set -e
-addgroup --system --gid 102 cartesi
-adduser --system --uid 102 \
-    --disabled-login \
-    --gecos "cartesi user" \
-    --home /nonexistent \
-    --ingroup cartesi \
-    --no-create-home \
-    --shell /bin/false \
-    cartesi
+    rm -rf /var/lib/apt/lists/*
 EOF
 
-####################################################################################################
-# TARGET: rollups-node-snapshot
+# =============================================================================
+# STAGE: rollups-node-ci
+#
+# This stage prepares the CI image.
 #
-# This target contains the Cartesi machine snapshot used in the rollups-node integration and
-# end-to-end tests.
+# - Install git and build-essential (setup).
+# - Set CGO_ENABLED.
+# - Install docker.
+# =============================================================================
+
+FROM emulator-devel as rollups-node-ci
+
+# Install git and build-essential (setup).
+RUN <<EOF
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends git-all build-essential
+EOF
+
+ENV CGO_ENABLED=1
 
+# Install docker.
+RUN <<EOF
+    install -m 0755 -d /etc/apt/keyrings
+    URL=https://download.docker.com/linux/debian
+    curl -fsSL ${URL}/gpg -o /etc/apt/keyrings/docker.asc
+    chmod a+r /etc/apt/keyrings/docker.asc
+    ARCH=$(dpkg --print-architecture)
+    SIGNED_BY=/etc/apt/keyrings/docker.asc
+    echo "deb [arch=${ARCH} signed-by=${SIGNED_BY}] ${URL} $(. /etc/os-release && echo "$VERSION_CODENAME") stable" \
+        | tee /etc/apt/sources.list.d/docker.list > /dev/null
+    apt-get update
+    apt-get install -y --no-install-recommends \
+        docker-ce \
+        docker-ce-cli \
+        containerd.io \
+        docker-buildx-plugin \
+        docker-compose-plugin
+    # Cartesi Machine Emulator
+    SDK_URL=https://github.com/cartesi/machine-emulator-sdk
+EOF
+
+# =============================================================================
 # STAGE: snapshot-builder
 #
-# This stage builds the snapshot using the machine emulator as base image.
-FROM emulator-base as snapshot-builder
-
-# Download rootfs and linux.
-# Add these files to the directories the cartesi-machine expects.
-WORKDIR /usr/share/cartesi-machine/images/
-ARG TOOLS_VERSION
-ARG LINUX_VERSION
-ARG LINUX_KERNEL_VERSION
-ADD https://github.com/cartesi/machine-emulator-tools/releases/download/v${TOOLS_VERSION}/rootfs-tools-v${TOOLS_VERSION}.ext2 rootfs.ext2
-ADD https://github.com/cartesi/image-kernel/releases/download/v${LINUX_VERSION}/linux-${LINUX_KERNEL_VERSION}.bin linux.bin
-
-# Generate snapshot with echo and store it.
+# - Build an echo snapshot.
+#
+# DEPRECATED: this stage is going to be deleted, as the CI won't be generating
+# machine snapshots in the future.
+# =============================================================================
+
+FROM emulator as snapshot-builder
+
 WORKDIR /build
 ARG SNAPSHOT_BUILD_PATH
 RUN cartesi-machine \
     --ram-length=128Mi \
     --store=$SNAPSHOT_BUILD_PATH \
+    --no-rollback \
     -- "ioctl-echo-loop --vouchers=1 --notices=1 --reports=1 --verbose=1"
 
+# =============================================================================
 # STAGE: rollups-node-snapshot
 #
-# This stage copies the image from the builder.
-# We use the emulator as base image so we can easily create a container with a volume shared with
-# the rollups-node container.
-FROM emulator-base as rollups-node-snapshot
+# DEPRECATED: this stage is going to be deleted, as the CI won't be generating
+# machine snapshots in the future.
+# =============================================================================
+
+FROM emulator as rollups-node-snapshot
 
 # Copy image from the builder stage.
 ARG SNAPSHOT_BUILD_PATH
 ARG SNAPSHOT_RUNTIME_PATH
 WORKDIR ${SNAPSHOT_RUNTIME_PATH}
-COPY --from=snapshot-builder --chown=cartesi:cartesi ${SNAPSHOT_BUILD_PATH} ${SNAPSHOT_RUNTIME_PATH}
+COPY --from=snapshot-builder --chown=cartesi:cartesi \
+    ${SNAPSHOT_BUILD_PATH} ${SNAPSHOT_RUNTIME_PATH}
 
 # Set dummy command.
 CMD /bin/bash
 
-####################################################################################################
-# TARGET: rollups-node-devnet
-#
-# This target contains the Ethereum node that rollups node uses for testing.
-# This target requires the machine-snapshot built in the snapshot-builder stage.
-
+# =============================================================================
 # STAGE: devnet-base
 #
-# This stage installs Foundry.
+# - Install ca-certificates, curl, and git (setup).
+# - Install Foundry from downloaded pre-compiled binaries.
+# =============================================================================
+
 FROM ${BASE_IMAGE} as devnet-base
 
-# Install system dependencies.
+# Install ca-certificates, curl, and git (setup).
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
-set -e
-apt-get update
-apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    git
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends ca-certificates curl git
 EOF
 
-# Install Foundry from downloaded pre-compiled binaries
+# Install Foundry from downloaded pre-compiled binaries.
 ARG FOUNDRY_NIGHTLY_VERSION
-RUN curl -sSL https://github.com/foundry-rs/foundry/releases/download/nightly-${FOUNDRY_NIGHTLY_VERSION}/foundry_nightly_linux_$(dpkg --print-architecture).tar.gz | \
-        tar -zx -C /usr/local/bin
+RUN <<EOF
+    set -e
+    URL=https://github.com/foundry-rs/foundry/releases/download
+    VERSION=nightly-${FOUNDRY_NIGHTLY_VERSION}
+    ARCH=$(dpkg --print-architecture)
+    ARTIFACT=foundry_nightly_linux_${ARCH}.tar.gz
+    curl -sSL ${URL}/${VERSION}/${ARTIFACT} | tar -zx -C /usr/local/bin
+EOF
 
+# =============================================================================
 # STAGE: devnet-builder
 #
 # This stage builds the devnet state that will be loaded in Anvil.
+# =============================================================================
+
 FROM devnet-base as devnet-builder
 ARG DEVNET_BUILD_PATH
 WORKDIR ${DEVNET_BUILD_PATH}
 
-# Install system dependencies.
+# Install gnupg (setup).
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
-set -e
-apt-get update
-apt-get install -y --no-install-recommends \
-    gnupg
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends gnupg
 EOF
 
-# Install nodejs
+# Install nodejs.
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
-set -e
-curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
-apt-get install -y nodejs
+    set -e
+    curl -fsSL https://deb.nodesource.com/setup_20.x | bash -
+    apt-get install -y nodejs
 EOF
 
-# Install pnpm
+# Install pnpm.
 RUN npm install -g @pnpm/exe
 
-# Install Go
+# Install Go.
 ARG GO_VERSION
-RUN curl -sSL https://go.dev/dl/go${GO_VERSION}.linux-$(dpkg --print-architecture).tar.gz | \
-         tar -zx -C /usr/local
+RUN <<EOF
+    set -e
+    ARCH=$(dpkg --print-architecture)
+    URL=https://go.dev/dl/go${GO_VERSION}.linux-${ARCH}.tar.gz
+    curl -sSL ${URL} | tar -zx -C /usr/local
+EOF
 ENV PATH=$PATH:/usr/local/go/bin
 
-# Copy gen-devnet script and dependencies
-# This should be simplified in the future when `COPY --parents` is made available
+# Copy gen-devnet script and dependencies.
+# NOTE: this should be simplified in the future when
+#       `COPY --parents` is made available.
 COPY internal internal
 COPY pkg pkg
 COPY rollups-contracts rollups-contracts
 COPY cmd/gen-devnet cmd/gen-devnet
 
-# Download external dependencies
+# Download external dependencies.
 COPY go.mod .
 COPY go.sum .
 RUN go mod download
 
-# Copy machine snapshot hash
+# Copy machine snapshot hash.
 ARG SNAPSHOT_BUILD_PATH
 COPY --from=snapshot-builder ${SNAPSHOT_BUILD_PATH}/hash hash.bin
 
-# Generate anvil state
+# Generate anvil state.
 RUN go run ./cmd/gen-devnet --verbose --template-hash-file hash.bin
 
+# =============================================================================
 # STAGE: rollups-node-devnet
 #
-# This stage copies the anvil state from the builder stage and start the local anvil instance.
+# This stage contains the Ethereum node that the rollups node uses for testing.
+#
+# It copies the anvil state from the builder stage and starts the local anvil
+# instance.
+# =============================================================================
+
 FROM devnet-base as rollups-node-devnet
 
-# Copy anvil state file and devnet deployment info
+# Copy anvil state file and devnet deployment info.
 ARG DEVNET_BUILD_PATH
 ARG DEVNET_SHARE_PATH=/usr/share/devnet
 ENV ANVIL_STATE_PATH=${DEVNET_SHARE_PATH}/anvil_state.json
@@ -217,47 +360,50 @@ HEALTHCHECK --interval=1s --timeout=1s --retries=5 \
 # Start Anvil.
 CMD anvil --block-time 1 --load-state $ANVIL_STATE_PATH
 
-####################################################################################################
-# TARGET: rollups-node
-#
-# This target is the final Docker image that will be used in the production environment.
-# It installs all the binaries necessary to run the node in /usr/bin.
-
+# =============================================================================
 # STAGE: rust-chef
 #
-# This stage installs the cargo-chef tool.
+# - Instal cargo-chef.
+# =============================================================================
+
 FROM rust:${RUST_VERSION}-bookworm AS rust-chef
 ARG RUST_BUILD_PATH
 WORKDIR ${RUST_BUILD_PATH}
 RUN <<EOF
-set -e
-rustup component add rustfmt
-cargo install cargo-chef
+    set -e
+    rustup component add rustfmt
+    cargo install cargo-chef
 EOF
 
+# =============================================================================
 # STAGE: rust-prepare
 #
 # This stage prepares the recipe with just the external dependencies.
+# =============================================================================
+
 FROM rust-chef as rust-prepare
 COPY ./cmd/authority-claimer/ .
 RUN cargo chef prepare --recipe-path recipe.json
 
+# =============================================================================
 # STAGE: rust-builder
 #
-# This stage builds the Rust binaries.
-# First it builds the external dependencies and then it builds the node binaries.
+# This stage builds the Rust binaries. First it builds the external
+# dependencies and then it builds the node binaries.
+# =============================================================================
+
 FROM rust-chef as rust-builder
 
 # Install system dependencies.
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
-set -e
-apt-get update
-apt-get install -y --no-install-recommends \
-    cmake \
-    curl \
-    libprotobuf-dev \
-    protobuf-compiler
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends \
+        cmake \
+        curl \
+        libprotobuf-dev \
+        protobuf-compiler
 EOF
 
 # Build external dependencies with cargo chef.
@@ -268,10 +414,13 @@ RUN cargo chef cook --release --recipe-path recipe.json
 COPY ./cmd/authority-claimer/ .
 RUN cargo build --release
 
+# =============================================================================
 # STAGE: go-builder
 #
-# This stage builds the Go binaries.
-# First it downloads the external dependencies and then it builds the binaries.
+# This stage builds the Go binaries. First it downloads the external
+# dependencies and then it builds the binaries.
+# =============================================================================
+
 FROM golang:${GO_VERSION}-bookworm as go-builder
 ARG GO_BUILD_PATH
 ARG ROLLUPS_NODE_VERSION
@@ -286,37 +435,45 @@ RUN go mod download
 COPY . .
 RUN go build -ldflags "-s -w -X 'main.buildVersion=${ROLLUPS_NODE_VERSION}'" ./cmd/cartesi-rollups-node
 
+# =============================================================================
 # STAGE: rollups-node
 #
-# This stage copies the binaries from the previous stages.
-FROM emulator-base as rollups-node
+# This stage prepares the final Docker image that will be used in the production
+# environment. It installs in /usr/bin all the binaries necessary to run the
+# node.
+#
+# (This stage copies the binaries from previous stages.)
+# =============================================================================
 
-# Download system dependencies required in runtime.
+FROM emulator as rollups-node
+
+# Download system dependencies required at runtime.
 ARG DEBIAN_FRONTEND=noninteractive
 RUN <<EOF
-set -e
-apt-get update
-apt-get install -y --no-install-recommends \
-    ca-certificates \
-    curl \
-    libpq5 \
-    redis \
-    redis-tools \
-    libboost-coroutine1.81.0 \
-    libboost-context1.81.0 \
-    libboost-filesystem1.81.0 \
-    libboost-log1.81.0 \
-    libcrypto++8 \
-    procps \
-    nodejs \
-    npm
-rm -rf /var/lib/apt/lists/*
-npm install -g postgraphile
-npm install -g --save @graphile-contrib/pg-simplify-inflector
+    set -e
+    apt-get update
+    apt-get install -y --no-install-recommends \
+        ca-certificates \
+        curl \
+        libpq5 \
+        redis \
+        redis-tools \
+        libboost-coroutine1.81.0 \
+        libboost-context1.81.0 \
+        libboost-filesystem1.81.0 \
+        libboost-log1.81.0 \
+        libcrypto++8 \
+        procps \
+        nodejs \
+        npm
+    rm -rf /var/lib/apt/lists/*
+    npm install -g postgraphile
+    npm install -g --save @graphile-contrib/pg-simplify-inflector
 EOF
 
 # Copy Rust binaries.
-# Explicitly copy each binary to avoid adding unnecessary files to the runtime image.
+# Explicitly copy each binary to avoid adding unnecessary files to the runtime
+# image.
 ARG RUST_BUILD_PATH
 ARG RUST_TARGET=${RUST_BUILD_PATH}/target/release
 COPY --from=rust-builder ${RUST_TARGET}/cartesi-rollups-authority-claimer /usr/bin
@@ -335,20 +492,3 @@ USER cartesi
 
 # Set the Go supervisor as the command.
 CMD [ "cartesi-rollups-node" ]
-
-
-# STAGE: rollups-ci-base
-#
-# This stage prepares the base CI image
-FROM ${BASE_IMAGE} as rollups-node-ci-base
-
-# Install Git and Docker
-RUN <<EOF
-    apt update && apt install -y --no-install-recommends git-all ca-certificates curl
-    install -m 0755 -d /etc/apt/keyrings
-    curl -fsSL https://download.docker.com/linux/debian/gpg -o /etc/apt/keyrings/docker.asc
-    chmod a+r /etc/apt/keyrings/docker.asc
-    echo "deb [arch=$(dpkg --print-architecture) signed-by=/etc/apt/keyrings/docker.asc] https://download.docker.com/linux/debian $(. /etc/os-release && echo "$VERSION_CODENAME") stable" | tee /etc/apt/sources.list.d/docker.list > /dev/null
-    apt-get update
-    apt-get install -y --no-install-recommends docker-ce docker-ce-cli containerd.io docker-buildx-plugin docker-compose-plugin
-EOF
\ No newline at end of file
diff --git a/build/docker-bake.override.hcl b/build/docker-bake.override.hcl
index d2204f478..69177bd88 100644
--- a/build/docker-bake.override.hcl
+++ b/build/docker-bake.override.hcl
@@ -21,6 +21,6 @@ target "rollups-node-devnet" {
   tags = ["${DOCKER_ORGANIZATION}/rollups-node-devnet:${TAG}"]
 }
 
-target "rollups-node-ci-base" {
-  tags = ["${DOCKER_ORGANIZATION}/rollups-node-ci-base:${TAG}"]
+target "rollups-node-ci" {
+  tags = ["${DOCKER_ORGANIZATION}/rollups-node-ci:${TAG}"]
 }
diff --git a/build/docker-bake.platforms.hcl b/build/docker-bake.platforms.hcl
index 18f87a522..f128f619e 100644
--- a/build/docker-bake.platforms.hcl
+++ b/build/docker-bake.platforms.hcl
@@ -4,6 +4,10 @@
 target "docker-platforms" {
     platforms = [
         "linux/amd64",
-        "linux/arm64"
+        # TODO: libarchive13 (required by xgenext2fs in the emulator-devel
+        # stage) is not available for arm64. We are temporarily disabling this
+        # platform now, but will come back to it before merging next/2.0 into
+        # main.
+        # "linux/arm64"
     ]
 }
diff --git a/internal/node/machinehash_test.go b/internal/node/machinehash_test.go
index c1aefc8fb..76dc1b24d 100644
--- a/internal/node/machinehash_test.go
+++ b/internal/node/machinehash_test.go
@@ -116,8 +116,7 @@ func mockMachineDir(hash string) (string, error) {
 	return temp, nil
 }
 
-// Generates a new Cartesi Machine snapshot in a temporary directory and returns
-// its path
+// Generates a new Cartesi Machine snapshot in a temporary directory and returns its path
 func createMachineSnapshot() (string, error) {
 	tmpDir, err := os.MkdirTemp("", "")
 	if err != nil {