From 75dfc7f812a812a3a37b0cc9673ec000b72e9bf6 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Sun, 27 Aug 2023 17:51:57 -0400 Subject: [PATCH] Depend on build when using the docker images. --- docker/cargo_fmt/Makefile | 4 ++-- docker/organic_build/Makefile | 4 ++-- docker/organic_test/Makefile | 4 ++-- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker/cargo_fmt/Makefile b/docker/cargo_fmt/Makefile index c9d958d..68bb409 100644 --- a/docker/cargo_fmt/Makefile +++ b/docker/cargo_fmt/Makefile @@ -28,9 +28,9 @@ endif # NOTE: This target will write to folders underneath the git-root .PHONY: run -run: +run: build docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME) .PHONY: shell -shell: +shell: build docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source $(IMAGE_NAME) diff --git a/docker/organic_build/Makefile b/docker/organic_build/Makefile index 709b062..9f2b7ba 100644 --- a/docker/organic_build/Makefile +++ b/docker/organic_build/Makefile @@ -28,9 +28,9 @@ endif # NOTE: This target will write to folders underneath the git-root .PHONY: run -run: +run: build docker run --rm --init -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME) .PHONY: shell -shell: +shell: build docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry $(IMAGE_NAME) diff --git a/docker/organic_test/Makefile b/docker/organic_test/Makefile index 28649d2..371b661 100644 --- a/docker/organic_test/Makefile +++ b/docker/organic_test/Makefile @@ -27,9 +27,9 @@ else endif .PHONY: run -run: +run: build docker run --rm --init -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME) --no-fail-fast --lib --test test_loader .PHONY: shell -shell: +shell: build docker run --rm -i -t --entrypoint /bin/sh -v "$$(readlink -f ../../):/source:ro" --workdir=/source --mount source=cargo-cache,target=/usr/local/cargo/registry --mount source=rust-cache,target=/target --env CARGO_TARGET_DIR=/target $(IMAGE_NAME)