From c733acf4104cf6a5c41a2bc34fd2cccb749e0739 Mon Sep 17 00:00:00 2001 From: mdecimus Date: Thu, 26 Jun 2025 13:26:54 +0200 Subject: [PATCH] Include resources directory in Docker builds (closes #1725 closes #1727) --- .dockerignore | 2 +- Dockerfile.build | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.dockerignore b/.dockerignore index 37e7be3f..27780830 100644 --- a/.dockerignore +++ b/.dockerignore @@ -4,7 +4,7 @@ // Allow what is needed !crates !tests -!resources/docker/entrypoint.sh +!resources !Cargo.lock !Cargo.toml diff --git a/Dockerfile.build b/Dockerfile.build index 24a73097..d13f7c18 100644 --- a/Dockerfile.build +++ b/Dockerfile.build @@ -84,8 +84,6 @@ RUN \ mv /fdb/usr/lib/libfdb_c.so /usr/lib && \ rm -rf fdb-client.deb /fdb; \ fi -# Copy the source code -COPY . . # Cargo-chef Cache layer RUN \ --mount=type=secret,id=ACTIONS_RESULTS_URL,env=ACTIONS_RESULTS_URL \ @@ -104,6 +102,8 @@ RUN \ source /env-cargo && \ cargo chef cook --recipe-path recipe.json --zigbuild --release --target ${TARGET} -p stalwart --no-default-features --features "sqlite postgres mysql rocks elastic s3 redis azure nats enterprise" && \ cargo chef cook --recipe-path recipe.json --zigbuild --release --target ${TARGET} -p stalwart-cli +# Copy the source code +COPY . . ENV RUSTC_WRAPPER="sccache" \ SCCACHE_GHA_ENABLED=true # Build FoundationDB version