From 2196ba692fcef1779fa468754cf527326854287c Mon Sep 17 00:00:00 2001
From: gusto <bacv@users.noreply.github.com>
Date: Thu, 27 Mar 2025 13:42:03 +0200
Subject: [PATCH] chore: Update dockerfiles to use rzup (#1196)

---
 .github/actions/install-risc0/action.yml | 5 +++++
 Dockerfile                               | 3 +--
 ci/Dockerfile                            | 5 +++--
 testnet/Dockerfile                       | 2 +-
 4 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/actions/install-risc0/action.yml b/.github/actions/install-risc0/action.yml
index 85532fba3..1810c1b00 100644
--- a/.github/actions/install-risc0/action.yml
+++ b/.github/actions/install-risc0/action.yml
@@ -19,6 +19,11 @@ runs:
       # rzup manage risc0 rust toolchain. To check what are supported versions
       # visit https://github.com/risc0/risc0 and https://github.com/risc0/rust
       # release pages.
+      #
+      # When updating rzup, risczero or risc0 rust toolchain also update these files:
+      # * Dockerfile
+      # * ci/Dockerfile
+      # * testnet/Dockerfile
       run: |
         cargo install rzup --version 0.4.1 --locked \
           && ~/.cargo/bin/rzup install cargo-risczero 2.0.0 \
diff --git a/Dockerfile b/Dockerfile
index f3de3bcfe..1ea16e73e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -16,8 +16,7 @@ RUN apt-get update && apt-get install -yq \
     git gcc g++ clang libssl-dev pkg-config ca-certificates
 
 RUN cargo install cargo-binstall --locked
-
-RUN cargo binstall risc0 --no-confirm
+RUN cargo install rzup --version 0.4.1 --locked
 RUN rzup install cargo-risczero 2.0.0
 RUN rzup install rust 1.85.0
 
diff --git a/ci/Dockerfile b/ci/Dockerfile
index a4e672ee9..96933823f 100644
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -24,5 +24,6 @@ RUN mkdir -p /home/jenkins/.local/share/cargo-risczero/toolchains \
 USER jenkins
 
 RUN cargo install cargo-binstall --locked
-RUN cargo binstall -y cargo-risczero
-RUN cargo risczero install
+RUN cargo install rzup --version 0.4.1 --locked
+RUN /home/jenkins/.cargo/bin/rzup install cargo-risczero 2.0.0
+RUN /home/jenkins/.cargo/bin/rzup install rust 1.85.0
diff --git a/testnet/Dockerfile b/testnet/Dockerfile
index 5c3a7f38d..a559d3f05 100644
--- a/testnet/Dockerfile
+++ b/testnet/Dockerfile
@@ -14,7 +14,7 @@ RUN apt-get update && apt-get install -yq \
     git gcc g++ clang libssl-dev pkg-config ca-certificates
 
 RUN cargo install cargo-binstall --locked
-RUN cargo binstall risc0 --no-confirm
+RUN cargo install rzup --version 0.4.1 --locked
 RUN rzup install cargo-risczero 2.0.0
 RUN rzup install rust 1.85.0