From 38602067caa5dc607d832b08cca6c77a0fcca8b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Tue, 29 Oct 2024 15:23:03 +0100 Subject: [PATCH] Fix memory_dumping Dockerfile (#14) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ## 🎟ī¸ Tracking ## 📔 Objective When we moved `bitwarden-sm` to `bitwarden_license`, the memory dump docker tool broke as it was not copying those files over. Because this is just a local test tool, rather than just copy everything over which would cause frequent cache busting, we can remove the `bitwarden_license` folder from the workspace. ## ⏰ Reminders before review - Contributor guidelines followed - All formatters and local linters executed and passed - Written new unit and / or integration tests where applicable - Protected functional changes with optionality (feature flags) - Used internationalization (i18n) for all UI strings - CI builds passed - Communicated to DevOps any deployment requirements - Updated any necessary documentation (Confluence, contributing docs) or informed the documentation team ## đŸĻŽ Reviewer guidelines - 👍 (`:+1:`) or similar for great changes - 📝 (`:memo:`) or ℹī¸ (`:information_source:`) for notes or general info - ❓ (`:question:`) for questions - 🤔 (`:thinking:`) or 💭 (`:thought_balloon:`) for more open inquiry that's not quite a confirmed issue and could potentially benefit from discussion - 🎨 (`:art:`) for suggestions / improvements - ❌ (`:x:`) or ⚠ī¸ (`:warning:`) for more significant problems or concerns needing attention - 🌱 (`:seedling:`) or â™ģī¸ (`:recycle:`) for future improvements or indications of technical debt - ⛏ (`:pick:`) for minor or nitpick changes --- crates/memory-testing/Dockerfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/crates/memory-testing/Dockerfile b/crates/memory-testing/Dockerfile index 3df22466..d2abedd7 100644 --- a/crates/memory-testing/Dockerfile +++ b/crates/memory-testing/Dockerfile @@ -10,6 +10,9 @@ COPY Cargo.toml Cargo.lock /app/ COPY crates/bitwarden-crypto/Cargo.toml /app/crates/bitwarden-crypto/ COPY crates/memory-testing/Cargo.toml /app/crates/memory-testing/ +# Patch Cargo.toml to remove `, "bitwarden_license/*"` from the members array +RUN sed -i 's/, "bitwarden_license\/\*"\(,\?\)/\1/' Cargo.toml + RUN mkdir -p /app/crates/bitwarden-crypto/src \ /app/crates/bitwarden-crypto/benches \ /app/crates/memory-testing/src \