chore(common): upgrade rust golden image (#877)

eudelins-zama · web-flow · commit 4f63a76b2528 · 2025-09-23T09:15:37.000+02:00
* chore(common): upgrade rust golden image

* chore(common): upgrade services' base image

* chore(kms-connector): remove apk install in docker

* chore(common): remove openssh from golden image
diff --git a/.github/workflows/coprocessor-cargo-clippy.yml b/.github/workflows/coprocessor-cargo-clippy.yml
@@ -52,7 +52,7 @@ jobs:
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
       with:
-        toolchain: 1.89.0
+        toolchain: 1.90.0
         components: clippy
 
     - name: Install dependencies
diff --git a/.github/workflows/coprocessor-cargo-fmt.yml b/.github/workflows/coprocessor-cargo-fmt.yml
@@ -45,7 +45,7 @@ jobs:
     - name: Setup Rust
       uses: dtolnay/rust-toolchain@a54c7afa936fefeb4456b2dd8068152669aa8203
       with:
-        toolchain: 1.89.0
+        toolchain: 1.90.0
         components: rustfmt
 
     - name: Run fmt
diff --git a/coprocessor/fhevm-engine/db-migration/Dockerfile b/coprocessor/fhevm-engine/db-migration/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build DB Migration
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/gw-listener/Dockerfile b/coprocessor/fhevm-engine/gw-listener/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build GW Listener
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/host-listener/Dockerfile b/coprocessor/fhevm-engine/host-listener/Dockerfile
@@ -13,7 +13,7 @@ RUN cp .env.example .env
 RUN npm install && HARDHAT_NETWORK=hardhat npm run deploy:emptyProxies && npx hardhat compile
 
 # Stage 1: Build Transaction Sender
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/rust-toolchain.toml b/coprocessor/fhevm-engine/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.89.0"
+channel = "1.90.0"
diff --git a/coprocessor/fhevm-engine/sns-worker/Dockerfile b/coprocessor/fhevm-engine/sns-worker/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build SNS Worker
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/stress-test-generator/Dockerfile b/coprocessor/fhevm-engine/stress-test-generator/Dockerfile
@@ -16,7 +16,7 @@ RUN npm ci --include=dev \
     && npx hardhat compile
 
 # Stage 1: Build Stress-Tool
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/stress-test-generator/rust-toolchain.toml b/coprocessor/fhevm-engine/stress-test-generator/rust-toolchain.toml
@@ -1,2 +1,2 @@
 [toolchain]
-channel = "1.89.0"
+channel = "1.90.0"
diff --git a/coprocessor/fhevm-engine/tfhe-worker/Dockerfile b/coprocessor/fhevm-engine/tfhe-worker/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build TFHE Worker
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/transaction-sender/Dockerfile b/coprocessor/fhevm-engine/transaction-sender/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build Transaction Sender
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/coprocessor/fhevm-engine/zkproof-worker/Dockerfile b/coprocessor/fhevm-engine/zkproof-worker/Dockerfile
@@ -1,5 +1,5 @@
 # Stage 1: Build ZK Proof Worker
-FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.89.0 AS builder
+FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:1.90.0 AS builder
 
 USER root
 
diff --git a/golden-container-images/rust-glibc/Dockerfile b/golden-container-images/rust-glibc/Dockerfile
@@ -1,6 +1,6 @@
-FROM cgr.dev/zama.ai/glibc-dynamic:15.2.0-dev AS builder
+FROM cgr.dev/zama.ai/glibc-dynamic:15.2.0-dev AS prod
 
-ARG RUST_IMAGE_VERSION=1.85.0
+ARG RUST_IMAGE_VERSION=1.90.0
 
 USER root
 
@@ -25,15 +25,14 @@ RUN apk add --no-cache \
     openssl-dev \
     protoc \
     protobuf \
-    openssh \
     postgresql-client \
     vim && \
     rm -rf /var/cache/apk/*
 
 # Install Rust in a location accessible to all users
-ENV RUSTUP_HOME=/usr/local/rustup
-ENV CARGO_HOME=/usr/local/cargo
-ENV PATH="/usr/local/cargo/bin:${PATH}"
+ENV RUSTUP_HOME=/usr/local/rustup \
+    CARGO_HOME=/usr/local/cargo \
+    PATH="/usr/local/cargo/bin:${PATH}"
 
 SHELL ["/bin/ash", "-o", "pipefail", "-c"]
 
@@ -42,44 +41,10 @@ RUN curl --proto '=https' --tlsv1.2 -sSf https://sh.rustup.rs | sh -s -- -y --de
     chmod -R a+w /usr/local/rustup
 
 # Set environment variables for building
-ENV CC=gcc
-ENV CXX=g++
-ENV RUSTFLAGS="-C target-feature=-crt-static"
-ENV OPENSSL_DIR=/usr
-
-
-FROM cgr.dev/zama.ai/glibc-dynamic:15.2.0-dev AS prod
-
-# Runtime base
-COPY --from=builder /lib/ /lib/
-COPY --from=builder /lib64/ /lib64/
-COPY --from=builder /usr/lib/ /usr/lib/
-COPY --from=builder /usr/lib64/ /usr/lib64/
-COPY --from=builder /usr/lib/gcc/ /usr/lib/gcc/
-COPY --from=builder /usr/libexec/ /usr/libexec/
-COPY --from=builder /usr/include/ /usr/include/
-COPY --from=builder /bin/ /bin/
-COPY --from=builder /usr/bin/ /usr/bin/
-
-# OpenSSL
-COPY --from=builder /etc/ssl/ /etc/ssl/
-COPY --from=builder /usr/include/openssl/ /usr/include/openssl/
-COPY --from=builder /usr/lib/libssl* /usr/lib/
-COPY --from=builder /usr/lib/libcrypto* /usr/lib/
-
-# User and group information
-COPY --from=builder /etc/group /etc/group
-COPY --from=builder /etc/passwd /etc/passwd
-COPY --from=builder --chown=fhevm:fhevm /home/fhevm /home/fhevm
-COPY --from=builder --chown=fhevm:fhevm /app /app
-
-# Rust and Cargo
-COPY --from=builder /usr/local/cargo /usr/local/cargo
-COPY --from=builder /usr/local/rustup /usr/local/rustup
-ENV RUSTUP_HOME=/usr/local/rustup
-ENV CARGO_HOME=/usr/local/cargo
-ENV PATH="/usr/local/cargo/bin:${PATH}"
-ENV RUSTFLAGS="-C target-feature=-crt-static"
+ENV RUSTFLAGS="-C target-feature=-crt-static" \
+    CC=gcc \
+    CXX=g++ \
+    OPENSSL_DIR=/usr
 
 USER fhevm:fhevm
 
diff --git a/kms-connector/crates/gw-listener/Dockerfile b/kms-connector/crates/gw-listener/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.89.0
+ARG RUST_IMAGE_VERSION=1.90.0
 
 # Stage 1: Build gw-listener
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
@@ -21,13 +21,6 @@ COPY .git ./.git
 COPY gateway-contracts/rust_bindings ./gateway-contracts/rust_bindings
 COPY kms-connector ./kms-connector
 
-# Install build dependencies
-RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
-    --mount=type=cache,target=/var/lib/apk,sharing=locked \
-    apk add --no-cache \
-    gcc \
-    protoc
-
 # Build with improved caching
 WORKDIR /app/kms-connector
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
diff --git a/kms-connector/crates/kms-worker/Dockerfile b/kms-connector/crates/kms-worker/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.89.0
+ARG RUST_IMAGE_VERSION=1.90.0
 
 # Stage 1: Build kms-worker
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
@@ -21,13 +21,6 @@ COPY .git ./.git
 COPY gateway-contracts/rust_bindings ./gateway-contracts/rust_bindings
 COPY kms-connector ./kms-connector
 
-# Install build dependencies
-RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
-    --mount=type=cache,target=/var/lib/apk,sharing=locked \
-    apk add --no-cache \
-    gcc \
-    protoc
-
 # Build with improved caching
 WORKDIR /app/kms-connector
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
diff --git a/kms-connector/crates/tx-sender/Dockerfile b/kms-connector/crates/tx-sender/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.89.0
+ARG RUST_IMAGE_VERSION=1.90.0
 
 # Stage 1: Build tx-sender
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
@@ -21,13 +21,6 @@ COPY .git ./.git
 COPY gateway-contracts/rust_bindings ./gateway-contracts/rust_bindings
 COPY kms-connector ./kms-connector
 
-# Install build dependencies
-RUN --mount=type=cache,target=/var/cache/apk,sharing=locked \
-    --mount=type=cache,target=/var/lib/apk,sharing=locked \
-    apk add --no-cache \
-    gcc \
-    protoc
-
 # Build with improved caching
 WORKDIR /app/kms-connector
 RUN --mount=type=cache,target=/usr/local/cargo/registry,sharing=locked \
diff --git a/test-suite/gateway-stress/Dockerfile b/test-suite/gateway-stress/Dockerfile
@@ -1,7 +1,7 @@
 # syntax=docker/dockerfile:1
 
 # RUST_IMAGE_VERSION arg can be used to override the default version
-ARG RUST_IMAGE_VERSION=1.89.0
+ARG RUST_IMAGE_VERSION=1.90.0
 
 # Stage 1: Build gateway-stress tool
 FROM ghcr.io/zama-ai/fhevm/gci/rust-glibc:${RUST_IMAGE_VERSION} AS builder
diff --git a/toolchain.txt b/toolchain.txt
@@ -1 +1 @@
-1.89.0
+1.90.0

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`[toolchain]`
`2`		`-channel = "1.89.0"`
	`2`	`+channel = "1.90.0"`