Skip to content
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

fix(docker): Stop resetting the cargo-chef cache in the Dockerfile #6934

Merged
merged 12 commits into from
Jun 22, 2023
Merged

fix(docker): Stop resetting the cargo-chef cache in the Dockerfile #6934

Changes from 2 commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
4ea9c08
Fix Dockerfile cache use
teor2345 Jun 13, 2023
8791962
Remove cache-breaking COPY commands
teor2345 Jun 13, 2023
be4f2ba
Use git to only reset files modified by cargo-chef
teor2345 Jun 13, 2023
96529b2
Copy .git and sources before cargo chef cook
teor2345 Jun 13, 2023
530b232
Update .dockerignore to include .git
teor2345 Jun 13, 2023
42ea327
Don't use .git
teor2345 Jun 14, 2023
805e736
Use rsync instead of git
teor2345 Jun 14, 2023
bbb6ebf
Maybe COPY is needed
teor2345 Jun 14, 2023
6a355ff
Merge branch 'main' into fix-docker-cache-disable
teor2345 Jun 14, 2023
4429dda
Actually copy changed files using rsync
teor2345 Jun 15, 2023
f646f9a
Actually copy the files using the correct rsync syntax
teor2345 Jun 15, 2023
808c13d
Remove ls commands from Dockerfile
teor2345 Jun 19, 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
13 changes: 7 additions & 6 deletions docker/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,10 +107,10 @@ COPY --from=us-docker.pkg.dev/zealous-zebra/zebra/lightwalletd /opt/lightwalletd
#
# This is the caching Docker layer for Rust!
#
# TODO: is it faster to use --tests here?
RUN cargo chef cook --release --features "${TEST_FEATURES} ${FEATURES}" --workspace --recipe-path recipe.json
# TODO: add --locked when cargo-chef supports it
RUN cargo chef cook --tests --release --features "${TEST_FEATURES} ${FEATURES}" --workspace --recipe-path recipe.json

COPY . .
# Test Zebra
RUN cargo test --locked --release --features "${TEST_FEATURES} ${FEATURES}" --workspace --no-run
RUN cp /opt/zebrad/target/release/zebrad /usr/local/bin
RUN cp /opt/zebrad/target/release/zebra-checkpoints /usr/local/bin
Expand All @@ -127,10 +127,11 @@ ENTRYPOINT [ "/entrypoint.sh" ]
# `test` stage. This step is a dependency for the `runtime` stage, which uses the resulting
# zebrad binary from this step.
FROM deps AS release
RUN cargo chef cook --release --features "${FEATURES}" --recipe-path recipe.json

COPY . .
# Build zebra
# TODO: add --locked when cargo-chef supports it
RUN cargo chef cook --release --features "${FEATURES}" --package zebrad --bin zebrad --recipe-path recipe.json

# Build zebrad
RUN cargo build --locked --release --features "${FEATURES}" --package zebrad --bin zebrad

COPY ./docker/runtime-entrypoint.sh /
Expand Down