From 0fa93e3e3f1c36782156d26a7bd42571b3a0d3e1 Mon Sep 17 00:00:00 2001
From: 0xfourzerofour <joshpauline@gmail.com>
Date: Fri, 23 Feb 2024 14:37:29 -0500
Subject: [PATCH] feat(release): install forge in prebuild

---
 Cross.toml       | 11 +++++------
 Dockerfile.build |  6 ------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Cross.toml b/Cross.toml
index 279064fc9..5319f1441 100644
--- a/Cross.toml
+++ b/Cross.toml
@@ -1,7 +1,6 @@
 [build]
-pre-build = [
-    "dpkg --add-architecture $CROSS_DEB_ARCH",
-    "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
-    "curl -L https://foundry.paradigm.xyz | bash",
-    ". /root/.bashrc && foundryup"
-]
+dockerfile = "./Dockerfile.build"
+# pre-build = [
+#     "dpkg --add-architecture $CROSS_DEB_ARCH",
+#     "apt-get update && apt-get install --assume-yes libssl-dev:$CROSS_DEB_ARCH",
+# ]
diff --git a/Dockerfile.build b/Dockerfile.build
index 71b6cc199..dc7380cb7 100644
--- a/Dockerfile.build
+++ b/Dockerfile.build
@@ -6,12 +6,6 @@ FROM $CROSS_BASE_IMAGE
 COPY --from=foundry /usr/local/bin/forge /usr/local/bin/forge
 
 ARG DEBIAN_FRONTEND=noninteractive
-
-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 protobuf-compiler yarn 
 RUN add-apt-repository ppa:ethereum/ethereum
 RUN apt-get update