AztecProtocol · charlielye · Sep 28, 2023 · Sep 28, 2023
diff --git a/build-system/scripts/build_local b/build-system/scripts/build_local
@@ -105,8 +105,8 @@ for E in "${PROJECTS[@]}"; do
         docker pull $CACHE_IMAGE_URI
       else
         docker build ${ADDITIONAL_ARGS:-} --build-arg ARG_COMMIT_HASH=$COMMIT_HASH -f $DOCKERFILE -t $CACHE_IMAGE_URI .
-        docker tag $CACHE_IMAGE_URI $DEPLOY_IMAGE_URI
       fi
+      docker tag $CACHE_IMAGE_URI $DEPLOY_IMAGE_URI
     fi
   fi
 

diff --git a/build_manifest.yml b/build_manifest.yml
@@ -84,7 +84,6 @@ l1-contracts:
 noir-contracts-build:
   buildDir: yarn-project
   projectDir: yarn-project/noir-contracts
-  dockerfile: Dockerfile.build
   rebuildPatterns:
     - ^yarn-project/noir-contracts/
     - ^yarn-project/aztec-nr/

diff --git a/yarn-project/acir-simulator/Dockerfile b/yarn-project/acir-simulator/Dockerfile
diff --git a/yarn-project/archiver/Dockerfile b/yarn-project/archiver/Dockerfile
diff --git a/yarn-project/aztec-node/Dockerfile b/yarn-project/aztec-node/Dockerfile
diff --git a/yarn-project/aztec.js/Dockerfile b/yarn-project/aztec.js/Dockerfile
diff --git a/yarn-project/circuits.js/Dockerfile b/yarn-project/circuits.js/Dockerfile
diff --git a/yarn-project/cli/Dockerfile b/yarn-project/cli/Dockerfile
diff --git a/yarn-project/ethereum/Dockerfile b/yarn-project/ethereum/Dockerfile
diff --git a/yarn-project/foundation/Dockerfile b/yarn-project/foundation/Dockerfile
diff --git a/yarn-project/key-store/Dockerfile b/yarn-project/key-store/Dockerfile
diff --git a/yarn-project/l1-artifacts/Dockerfile b/yarn-project/l1-artifacts/Dockerfile
diff --git a/yarn-project/merkle-tree/Dockerfile b/yarn-project/merkle-tree/Dockerfile
diff --git a/yarn-project/noir-compiler/Dockerfile b/yarn-project/noir-compiler/Dockerfile
diff --git a/yarn-project/noir-contracts/Dockerfile b/yarn-project/noir-contracts/Dockerfile
@@ -1,15 +1,20 @@
-FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder
-
-COPY . .
-
+FROM ubuntu:lunar
+RUN apt-get update && apt-get install -y \
+    jq \
+    curl \
+    git \
+    sed
+WORKDIR /usr/src/yarn-project
+COPY noir-contracts noir-contracts
+COPY noir-compiler noir-compiler
+COPY aztec-nr aztec-nr
 WORKDIR /usr/src/yarn-project/noir-contracts
-RUN yarn build && yarn test
 
-# Prune dev dependencies. See comment in base image.
-RUN yarn cache clean
-RUN yarn workspaces focus --production > /dev/null
+# Download and extract nargo
+ENV NARGO_HOME="/usr/src/yarn-project/noir-contracts/.nargo"
+RUN ./scripts/install_noirup.sh $(pwd)
+ENV PATH="/usr/src/yarn-project/noir-contracts/.nargo/bin:${PATH}"
 
-FROM node:18-alpine
-COPY --from=builder /usr/src/yarn-project/noir-contracts /usr/src/yarn-project/noir-contracts
-WORKDIR /usr/src/yarn-project/noir-contracts
-ENTRYPOINT ["yarn"]
+RUN ./scripts/install_noir.sh
+RUN ./scripts/compile_all.sh
+RUN ./scripts/nargo_test_ci.sh
diff --git a/yarn-project/noir-contracts/Dockerfile.build b/yarn-project/noir-contracts/Dockerfile.build
diff --git a/yarn-project/p2p-bootstrap/Dockerfile b/yarn-project/p2p-bootstrap/Dockerfile
diff --git a/yarn-project/p2p/Dockerfile b/yarn-project/p2p/Dockerfile
diff --git a/yarn-project/prover-client/Dockerfile b/yarn-project/prover-client/Dockerfile
diff --git a/yarn-project/pxe/Dockerfile b/yarn-project/pxe/Dockerfile
diff --git a/yarn-project/sequencer-client/Dockerfile b/yarn-project/sequencer-client/Dockerfile
diff --git a/yarn-project/types/Dockerfile b/yarn-project/types/Dockerfile