From f3b593b4ecf4868e1e68c0682c98ad8fbaf0fba7 Mon Sep 17 00:00:00 2001
From: Adrian Sutton <adrian@oplabs.co>
Date: Fri, 19 Apr 2024 10:28:17 +1000
Subject: [PATCH] Fix chain-mon docker image build (#10217)

* Add a make target to build the chain-mon docker image

* Include .pnpmfile.cjs in the packages docker build
---
 Makefile                       | 12 ++++++++++++
 ops/docker/Dockerfile.packages |  6 ++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/Makefile b/Makefile
index 2573851088b2..7c2f587ce1e4 100644
--- a/Makefile
+++ b/Makefile
@@ -41,6 +41,18 @@ golang-docker:
 			op-node op-batcher op-proposer op-challenger
 .PHONY: golang-docker
 
+chain-mon-docker:
+	# We don't use a buildx builder here, and just load directly into regular docker, for convenience.
+	GIT_COMMIT=$$(git rev-parse HEAD) \
+	GIT_DATE=$$(git show -s --format='%ct') \
+	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
+	docker buildx bake \
+			--progress plain \
+			--load \
+			-f docker-bake.hcl \
+			chain-mon
+.PHONY: chain-mon-docker
+
 contracts-bedrock-docker:
 	IMAGE_TAGS=$$(git rev-parse HEAD),latest \
 	docker buildx bake \
diff --git a/ops/docker/Dockerfile.packages b/ops/docker/Dockerfile.packages
index a4ba78875fc3..70c981b7f197 100644
--- a/ops/docker/Dockerfile.packages
+++ b/ops/docker/Dockerfile.packages
@@ -17,7 +17,7 @@ FROM alpine:3.16 as manifests
 RUN apk add coreutils
 
 WORKDIR /tmp
-COPY pnpm-lock.yaml pnpm-workspace.yaml .nvmrc package.json ./src/
+COPY pnpm-lock.yaml pnpm-workspace.yaml .nvmrc package.json .pnpmfile.cjs ./src/
 COPY packages src/packages/
 RUN mkdir manifests && \
   cd src && \
@@ -28,7 +28,9 @@ RUN mkdir manifests && \
   # pnpm-workspace.yaml
   cp pnpm-workspace.yaml ../manifests/ && \
   # .nvmrc
-  cp .nvmrc ../manifests/
+  cp .nvmrc ../manifests/ && \
+  # .pnpmfile.cjs
+  cp .pnpmfile.cjs ../manifests/
 
 FROM us-docker.pkg.dev/oplabs-tools-artifacts/images/ci-builder:latest as foundry
 # bullseye-slim is debian based