I remember why this was needed now.

AztecProtocol · Nov 29, 2023 · d91e5c7 · d91e5c7
1 parent 3b58a65
commit d91e5c7
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 6 deletions.
diff --git a/yarn-project/aztec-sandbox/Dockerfile b/yarn-project/aztec-sandbox/Dockerfile
@@ -1,5 +1,8 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project AS yarn-project
 
+# Need new arch specific image.
+FROM node:18-alpine as builder
+COPY --from=yarn-project /usr/src /usr/src
 ARG COMMIT_TAG=""
 
 # Update pxe version if COMMIT_TAG has been used.
@@ -19,9 +22,9 @@ RUN yarn workspaces focus --production && yarn cache clean && rm -rf ../**/src
 
 # Create final, arch specific, minimal size image.
 FROM node:18-alpine
-COPY --from=yarn-project /usr/src/yarn-project /usr/src/yarn-project
-COPY --from=yarn-project /usr/src/barretenberg/ts/package /usr/src/barretenberg/ts/package
-COPY --from=yarn-project /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
+COPY --from=builder /usr/src/barretenberg/ts/package /usr/src/barretenberg/ts/package
+COPY --from=builder /usr/src/noir/packages /usr/src/noir/packages
 # Just until weird source-resolver bug fixed.
 COPY --from=yarn-project /usr/src/noir/compiler /usr/src/noir/compiler
 WORKDIR /usr/src/yarn-project/aztec-sandbox

diff --git a/yarn-project/cli/Dockerfile b/yarn-project/cli/Dockerfile
@@ -1,5 +1,8 @@
 FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project AS yarn-project
 
+# Need new arch specific image.
+FROM node:18-alpine as builder
+COPY --from=yarn-project /usr/src /usr/src
 ARG COMMIT_TAG=""
 
 WORKDIR /usr/src/yarn-project/cli
@@ -12,9 +15,9 @@ RUN yarn workspaces focus --production && yarn cache clean && rm -rf ../**/src
 
 # Create final, arch specific, minimal size image.
 FROM node:18-alpine
-COPY --from=yarn-project /usr/src/yarn-project /usr/src/yarn-project
-COPY --from=yarn-project /usr/src/barretenberg/ts/package /usr/src/barretenberg/ts/package
-COPY --from=yarn-project /usr/src/noir/packages /usr/src/noir/packages
+COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
+COPY --from=builder /usr/src/barretenberg/ts/package /usr/src/barretenberg/ts/package
+COPY --from=builder /usr/src/noir/packages /usr/src/noir/packages
 
 ENV XDG_CACHE_HOME /cache
 RUN mkdir /cache && chmod 777 /cache