From 5b278376defefde97faeb9b6973d71e47ea72398 Mon Sep 17 00:00:00 2001 From: Josh McVey Date: Fri, 18 Oct 2024 08:44:51 -0500 Subject: [PATCH] no git needed --- analyses-snapshot-testing/Makefile | 2 -- analyses-snapshot-testing/citools/Dockerfile.local | 3 +-- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/analyses-snapshot-testing/Makefile b/analyses-snapshot-testing/Makefile index e6041e11f76..a4f2a910e95 100644 --- a/analyses-snapshot-testing/Makefile +++ b/analyses-snapshot-testing/Makefile @@ -126,9 +126,7 @@ local-build: @echo "Building docker image for your local opentrons code" @echo "The image will be named opentrons-analysis:local" @echo "For a fresh build, run 'make local-build NO_CACHE=1'" - sed -i.bak '/^.git/s/^/#/' ../.dockerignore || true docker build $(BUILD_FLAGS) -t opentrons-analysis:local -f citools/Dockerfile.local .. || true - mv ../.dockerignore.bak ../.dockerignore || true @echo "Build complete" .PHONY: local-snapshot-test diff --git a/analyses-snapshot-testing/citools/Dockerfile.local b/analyses-snapshot-testing/citools/Dockerfile.local index 34e695e2c1f..d4acf845031 100644 --- a/analyses-snapshot-testing/citools/Dockerfile.local +++ b/analyses-snapshot-testing/citools/Dockerfile.local @@ -10,10 +10,9 @@ RUN apt-get update && \ WORKDIR /opentrons # Copy everything from the build context into the /opentrons directory +# root directory .dockerignore file is respected COPY . /opentrons -# List the contents of the /opentrons directory to verify the .git folder is copied -RUN ls -al /opentrons/.git # Install required packages from the copied code RUN python -m pip install -U ./shared-data/python