From 472f79f08e2fbb0fcc07abbe6fed221e18a4f36f Mon Sep 17 00:00:00 2001 From: Paul Holzinger Date: Wed, 22 Jun 2022 13:21:45 +0200 Subject: [PATCH] test/testvol: move Containerfile into testvol dir I think it is confusion to have this Containerfile in the repo root. It is used for the tests only so we should move it into the same dir. Also adapt the Makefile target to use the new path and add the current date as tag instead of using latest which can break CI easily when we have to update the image. Signed-off-by: Paul Holzinger --- Makefile | 4 ++-- Containerfile-testvol => test/testvol/Containerfile | 0 2 files changed, 2 insertions(+), 2 deletions(-) rename Containerfile-testvol => test/testvol/Containerfile (100%) diff --git a/Makefile b/Makefile index 38ea7a2564..4d60ad4c8d 100644 --- a/Makefile +++ b/Makefile @@ -227,9 +227,9 @@ test/checkseccomp/checkseccomp: $(wildcard test/checkseccomp/*.go) test/testvol/testvol: $(wildcard test/testvol/*.go) $(GOCMD) build $(BUILDFLAGS) $(GO_LDFLAGS) '$(LDFLAGS_PODMAN)' -o $@ ./test/testvol -.PHONY: volume-plugin-test-image +.PHONY: volume-plugin-test-img volume-plugin-test-img: - podman build -t quay.io/libpod/volume-plugin-test-img -f Containerfile-testvol . + podman build -t quay.io/libpod/volume-plugin-test-img:$$(date +%Y%m%d) -f ./test/testvol/Containerfile . .PHONY: test/goecho/goecho test/goecho/goecho: $(wildcard test/goecho/*.go) diff --git a/Containerfile-testvol b/test/testvol/Containerfile similarity index 100% rename from Containerfile-testvol rename to test/testvol/Containerfile