fix(release): fix release pipeline

.github/workflows/docker-release.yaml

@@ -31,7 +31,7 @@ jobs:
         uses: dtolnay/rust-toolchain@stable
         with:
           components: clippy
-          toolchain: 1.71.0
+          toolchain: 1.75.0
 
       - name: Install toolchain (nightly)
         run: rustup toolchain add nightly --component rustfmt --profile minimal
@@ -40,6 +40,8 @@ jobs:
         with:
           cache-on-failure: true
 
+      - uses: taiki-e/install-action@cross
+
       - name: Login to Docker Hub
         uses: docker/login-action@v3
         with:
@@ -53,10 +55,8 @@ jobs:
 
       - name: Build and push image
         run: |
-          cargo install cross --git https://github.com/cross-rs/cross 
-
           if [ -n "${{ github.event.inputs.version }}" ]; then
-            make GIT_TAG="${{ github.event.inputs.version }}" docker-build 
+            sudo -E env "PATH=$PATH" make GIT_TAG="${{ github.event.inputs.version }}" docker-build 
           else
-            make docker-build-latest
+            sudo -E env "PATH=$PATH" make docker-build-latest
           fi

Cross.toml

@@ -1,2 +1,2 @@
 [build]
-dockerfile = "Dockerfile.build"
+dockerfile = "./Dockerfile.build"

Dockerfile

@@ -1,19 +1,18 @@
 # Adapted from https://github.com/paradigmxyz/reth/blob/main/Dockerfile
 # syntax=docker/dockerfile:1.4
 
+FROM ghcr.io/foundry-rs/foundry:latest as foundry
+
 FROM --platform=$TARGETPLATFORM rust:1.75.0 AS chef-builder
 
 # Install system dependencies
+COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
+SHELL ["/bin/bash", "-c"]
 RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
 RUN mkdir -p /etc/apt/keyrings
 RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
 RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config protobuf-compiler nodejs yarn rsync
-
-SHELL ["/bin/bash", "-c"]
-RUN curl -L https://foundry.paradigm.xyz | bash
-ENV PATH="/root/.foundry/bin:${PATH}"
-RUN foundryup
+RUN apt-get update && apt-get -y upgrade && apt-get install -y protobuf-compiler nodejs yarn rsync
 
 RUN cargo install cargo-chef --locked
 

Dockerfile.build

@@ -1,18 +1,22 @@
 ARG CROSS_BASE_IMAGE
-# Dockerfile.forge
+
 FROM ghcr.io/foundry-rs/foundry:latest as foundry
 
 FROM $CROSS_BASE_IMAGE
 COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
 
-ARG DEBIAN_FRONTEND=noninteractive
+# Install Node.js 14.x and Yarn
+RUN apt-get update \
+    && apt-get install -y curl \
+    && curl -fsSL https://deb.nodesource.com/setup_14.x | bash - \
+    && apt-get install -y nodejs \
+    && npm install -g yarn \
+    && apt-get clean
+
+RUN apt-get update && apt-get install -y unzip
+
+# Install Protobuf compiler v3
+RUN curl -LO https://github.com/protocolbuffers/protobuf/releases/download/v3.15.8/protoc-3.15.8-linux-x86_64.zip \
+    && unzip protoc-3.15.8-linux-x86_64.zip -d /usr/local \
+    && chmod +x /usr/local/bin/protoc
 
-RUN apt-get update && apt-get install -y gnupg2 apt-transport-https ca-certificates software-properties-common
-RUN curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | apt-key add - && echo "deb https://dl.yarnpkg.com/debian/ stable main" | tee /etc/apt/sources.list.d/yarn.list
-RUN mkdir -p /etc/apt/keyrings
-RUN curl -fsSL https://deb.nodesource.com/gpgkey/nodesource-repo.gpg.key | gpg --dearmor -o /etc/apt/keyrings/nodesource.gpg
-RUN echo "deb [signed-by=/etc/apt/keyrings/nodesource.gpg] https://deb.nodesource.com/node_20.x nodistro main" | tee /etc/apt/sources.list.d/nodesource.list
-RUN apt-get update && apt-get -y upgrade && apt-get install -y libclang-dev pkg-config protobuf-compiler nodejs yarn
-RUN add-apt-repository ppa:ethereum/ethereum
-RUN apt-get update
-RUN apt-get install -y solc

Makefile

@@ -39,7 +39,7 @@ submodule-update: ## Update git submodules
 	git submodule update
 
 build-%:
-	cross build --bin rundler --target $* --profile "$(PROFILE)"
+	cross build --target $* --profile "$(PROFILE)"
 
 .PHONY: fmt
 fmt: ## format code with nightly rust
@@ -71,6 +71,6 @@ define build_docker_image
 		--platform linux/arm64,linux/amd64 \
 		--tag $(DOCKER_IMAGE_NAME):$(1) \
 		$(if $(2),--tag $(DOCKER_IMAGE_NAME):$(2)) \
-		--provenance=false 
+		--provenance=false --push
 endef
 

bin/rundler/Cargo.toml

@@ -44,3 +44,5 @@ tracing.workspace = true
 tracing-appender = "0.2.2"
 tracing-log = "0.2.0"
 tracing-subscriber = { version = "0.3.16", features = ["env-filter", "fmt", "json"] }
+openssl = { version = "0.10", features = ["vendored"] }
+