summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPaul Holzinger <pholzing@redhat.com>2022-06-22 13:21:45 +0200
committerPaul Holzinger <pholzing@redhat.com>2022-06-23 17:43:09 +0200
commit472f79f08e2fbb0fcc07abbe6fed221e18a4f36f (patch)
treeab4ef28a86169f227ea4ee1c0e350de6d514c774
parent0d3aa61be4cf064fee07d004b1d08519c7624802 (diff)
downloadpodman-472f79f08e2fbb0fcc07abbe6fed221e18a4f36f.tar.gz
podman-472f79f08e2fbb0fcc07abbe6fed221e18a4f36f.tar.bz2
podman-472f79f08e2fbb0fcc07abbe6fed221e18a4f36f.zip
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 <pholzing@redhat.com>
-rw-r--r--Makefile4
-rw-r--r--test/testvol/Containerfile (renamed from Containerfile-testvol)0
2 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 38ea7a256..4d60ad4c8 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
index 6ff45064b..6ff45064b 100644
--- a/Containerfile-testvol
+++ b/test/testvol/Containerfile