Skip to content

Commit

Permalink
Fix chain-mon docker image build (ethereum-optimism#10217)
Browse files Browse the repository at this point in the history
* Add a make target to build the chain-mon docker image

* Include .pnpmfile.cjs in the packages docker build
  • Loading branch information
ajsutton authored Apr 19, 2024
1 parent 2094510 commit f3b593b
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 2 deletions.
12 changes: 12 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand Down
6 changes: 4 additions & 2 deletions ops/docker/Dockerfile.packages
Original file line number Diff line number Diff line change
Expand Up @@ -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 && \
Expand All @@ -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
Expand Down

0 comments on commit f3b593b

Please sign in to comment.