From 9ab1f45afc128f51965313c87bf5626dfacfe470 Mon Sep 17 00:00:00 2001
From: Francisco Moura <franciscoeduardomoura@gmail.com>
Date: Thu, 29 Aug 2024 14:43:08 -0300
Subject: [PATCH] WIP

---
 build/Dockerfile      | 6 ++++--
 build/docker-bake.hcl | 1 +
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/build/Dockerfile b/build/Dockerfile
index e18f6b515..febcb3706 100644
--- a/build/Dockerfile
+++ b/build/Dockerfile
@@ -209,7 +209,7 @@ ARG FOUNDRY_NIGHTLY_VERSION
 RUN <<EOF
     set -e
     URL=https://github.com/foundry-rs/foundry/releases/download
-    VERSION=nightly-626221f5ef44b4af950a08e09bd714650d9eb77d
+    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
@@ -223,6 +223,7 @@ EOF
 
 FROM devnet-base AS devnet-builder
 ARG DEVNET_BUILD_PATH
+ARG PNPM_VERSION
 WORKDIR ${DEVNET_BUILD_PATH}
 
 # Install gnupg (setup).
@@ -242,7 +243,8 @@ RUN <<EOF
 EOF
 
 # Install pnpm.
-RUN npm install -g @pnpm/exe
+# RUN npm install -g @pnpm/exe
+RUN curl -fsSL https://get.pnpm.io/install.sh | ENV="$HOME/.bashrc" PNPM_VERSION=${PNPM_VERSION} SHELL="$(which bash)" bash -
 
 # Install Go.
 ARG GO_VERSION
diff --git a/build/docker-bake.hcl b/build/docker-bake.hcl
index faa808573..722f37fa1 100644
--- a/build/docker-bake.hcl
+++ b/build/docker-bake.hcl
@@ -22,6 +22,7 @@ target "common" {
     RUST_VERSION                 = "1.78.0"
     GO_VERSION                   = "1.22.1"
     FOUNDRY_NIGHTLY_VERSION      = "626221f5ef44b4af950a08e09bd714650d9eb77d"
+    PNPM_VERSION                 = "v9.6.0"
     MACHINE_EMULATOR_VERSION     = "0.18.1"
     MACHINE_TOOLS_VERSION        = "0.16.1"
     MACHINE_IMAGE_KERNEL_VERSION = "0.20.0"