From cb7e3ae751f4c0b566a8079b135c03f5eff5bfff Mon Sep 17 00:00:00 2001 From: Mark Tyneway Date: Mon, 4 Oct 2021 15:32:08 -0700 Subject: [PATCH] ops: add .git folder to docker setup This allows scripts that depend on the git hash at build/runtime to access it. --- .dockerignore | 1 - ops/docker/Dockerfile.deployer | 1 + ops/docker/Dockerfile.monorepo | 2 ++ 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/.dockerignore b/.dockerignore index d9185447b480..0d9649358bc4 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ -.git .github node_modules diff --git a/ops/docker/Dockerfile.deployer b/ops/docker/Dockerfile.deployer index d41c30ff456b..db50bbf06e37 100644 --- a/ops/docker/Dockerfile.deployer +++ b/ops/docker/Dockerfile.deployer @@ -20,6 +20,7 @@ COPY --from=builder /optimism/packages/contracts/dist ./dist COPY --from=builder /optimism/packages/contracts/*.json ./ COPY --from=builder /optimism/packages/contracts/node_modules ./node_modules COPY --from=builder /optimism/packages/contracts/artifacts ./artifacts +COPY --from=builder /optimism/.git ./.git # get non-build artifacts from the host COPY packages/contracts/bin ./bin diff --git a/ops/docker/Dockerfile.monorepo b/ops/docker/Dockerfile.monorepo index 5c9f85c78bdd..16a14a5b8c34 100644 --- a/ops/docker/Dockerfile.monorepo +++ b/ops/docker/Dockerfile.monorepo @@ -22,6 +22,7 @@ FROM node as builder # note: this approach can be a bit unhandy to maintain, but it allows # us to cache the installation steps WORKDIR /optimism +COPY .git ./.git COPY *.json yarn.lock ./ COPY packages/core-utils/package.json ./packages/core-utils/package.json COPY packages/common-ts/package.json ./packages/common-ts/package.json @@ -45,6 +46,7 @@ WORKDIR /optimism COPY --from=builder /optimism/node_modules ./node_modules COPY --from=builder /optimism/packages ./packages COPY --from=builder /optimism/integration-tests ./integration-tests +COPY --from=builder /optimism/.git ./.git # the following steps are cheap COPY *.json yarn.lock ./