Skip to content

remove manual cp from Dockerfiles #184

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
spypsy wants to merge 4 commits into from
Closed

remove manual cp from Dockerfiles #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
0e685dc
remove manual cp from Dockerfiles
spypsy Apr 5, 2023
44e463a
COPY circuits.js in sequencer-client
spypsy Apr 5, 2023
337ec2f
add all deps
spypsy Apr 5, 2023
d27f7b5
add bb.js
spypsy Apr 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions yarn-project/barretenberg.js/package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,9 @@
"tsconfig": "./tsconfig.dest.json"
},
"scripts": {
"build": "tsc -b tsconfig.dest.json && cp ./src/wasm/barretenberg.wasm ./dest/wasm",
"build": "tsc -b tsconfig.dest.json && yarn build:link",
"build:dev": "tsc -b tsconfig.dest.json --watch",
"build:link": "ln -nf src/wasm/barretenberg.wasm dest/wasm/barretenberg.wasm",
"clean": "rm -rf ./dest .tsbuildinfo",
"formatting": "prettier --check ./src && eslint --max-warnings 0 ./src",
"formatting:fix": "prettier -w ./src",
Expand Down Expand Up @@ -56,4 +57,4 @@
"ts-node": "^10.9.1",
"typescript": "^4.9.5"
}
}
}
9 changes: 3 additions & 6 deletions yarn-project/circuits.js/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,17 +7,14 @@ COPY . .
WORKDIR /usr/src/yarn-project/circuits.js
RUN yarn build && yarn formatting

# (3) copy bb.js wasm binaries
RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/circuits.js/dest/wasm/aztec3-circuits.wasm

# (3.5) test
# (2.5) test
RUN yarn test

# (4) Prune dev dependencies. See comment in base image.
# (3) Prune dev dependencies. See comment in base image.
RUN yarn cache clean
RUN yarn workspaces focus --production > /dev/null

# (5) set up entry point
# (4) set up entry point
FROM node:18-alpine
COPY --from=builder /usr/src/yarn-project /usr/src/yarn-project
WORKDIR /usr/src/yarn-project/circuits.js
Expand Down
1 change: 0 additions & 1 deletion yarn-project/merkle-tree/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ WORKDIR /usr/src/yarn-project/foundation
RUN yarn build
WORKDIR /usr/src/yarn-project/barretenberg.js
RUN yarn build
RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm dest/wasm/barretenberg.wasm

WORKDIR /usr/src/yarn-project/merkle-tree
RUN yarn build && yarn formatting && yarn test
Expand Down
20 changes: 14 additions & 6 deletions yarn-project/sequencer-client/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,24 @@
FROM 278380418400.dkr.ecr.eu-west-2.amazonaws.com/yarn-project-base AS builder

# (1) project
COPY . .
COPY sequencer-client sequencer-client

# (2) build
# (2) dependencies
COPY circuits.js circuits.js
COPY barretenberg.js barretenberg.js
COPY ethereum.js ethereum.js
COPY foundation foundation
COPY l1-contracts l1-contracts
COPY l2-block l2-block
COPY merkle-tree merkle-tree
COPY p2p p2p
COPY tx tx
COPY world-state world-state

# (3) build
WORKDIR /usr/src/yarn-project/sequencer-client
RUN yarn build && yarn formatting

# (3) copy bb.js wasm binaries
RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/circuits.js/dest/wasm/aztec3-circuits.wasm
RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/barretenberg.js/dest/wasm/barretenberg.wasm

# (3.5) test
RUN yarn test

Expand Down
7 changes: 2 additions & 5 deletions yarn-project/world-state/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,14 +18,11 @@ RUN yarn build && yarn formatting
# (3.5) test
RUN yarn test

# (4) copy bb.js wasm binaries
RUN cp /usr/src/circuits/cpp/build-wasm/bin/aztec3-circuits.wasm /usr/src/yarn-project/barretenberg.js/dest/wasm/barretenberg.wasm

# (5) Prune dev dependencies. See comment in base image.
# (4) Prune dev dependencies. See comment in base image.
RUN yarn cache clean
RUN yarn workspaces focus --production > /dev/null

# (6) set up entry point
# (5) set up entry point
FROM node:18-alpine
COPY --from=builder /usr/src/yarn-project/world-state /usr/src/yarn-project/world-state
WORKDIR /usr/src/yarn-project/world-state
Expand Down