From 0d623914d01bcbc10beebf2db966e17da215dfbb Mon Sep 17 00:00:00 2001
From: Matthew Heon <matthew.heon@pm.me>
Date: Thu, 17 Oct 2019 11:25:28 -0400
Subject: Add support for anonymous volumes to `podman run -v`

Previously, when `podman run` encountered a volume mount without
separate source and destination (e.g. `-v /run`) we would assume
that both were the same - a bind mount of `/run` on the host to
`/run` in the container. However, this does not match Docker's
behavior - in Docker, this makes an anonymous named volume that
will be mounted at `/run`.

We already have (more limited) support for these anonymous
volumes in the form of image volumes. Extend this support to
allow it to be used with user-created volumes coming in from the
`-v` flag.

This change also affects how named volumes created by the
container but given names are treated by `podman run --rm` and
`podman rm -v`. Previously, they would be removed with the
container in these cases, but this did not match Docker's
behaviour. Docker only removed anonymous volumes. With this patch
we move to that model as well; `podman run -v testvol:/test` will
not have `testvol` survive the container being removed by `podman
rm -v`.

The sum total of these changes let us turn on volume removal in
`--rm` by default.

Fixes: #4276

Signed-off-by: Matthew Heon <matthew.heon@pm.me>
---
 test/e2e/run_volume_test.go | 77 +++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 77 insertions(+)

(limited to 'test')

diff --git a/test/e2e/run_volume_test.go b/test/e2e/run_volume_test.go
index 94bfebab7..d04eb07b3 100644
--- a/test/e2e/run_volume_test.go
+++ b/test/e2e/run_volume_test.go
@@ -280,4 +280,81 @@ var _ = Describe("Podman run with volumes", func() {
 		session2.WaitWithDefaultTimeout()
 		Expect(session2.ExitCode()).To(Equal(0))
 	})
+
+	It("podman run with anonymous volume", func() {
+		list1 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list1.WaitWithDefaultTimeout()
+		Expect(list1.ExitCode()).To(Equal(0))
+		Expect(list1.OutputToString()).To(Equal(""))
+
+		session := podmanTest.Podman([]string{"create", "-v", "/test", ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		list2 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list2.WaitWithDefaultTimeout()
+		Expect(list2.ExitCode()).To(Equal(0))
+		arr := list2.OutputToStringArray()
+		Expect(len(arr)).To(Equal(1))
+		Expect(arr[0]).To(Not(Equal("")))
+	})
+
+	It("podman rm -v removes anonymous volume", func() {
+		list1 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list1.WaitWithDefaultTimeout()
+		Expect(list1.ExitCode()).To(Equal(0))
+		Expect(list1.OutputToString()).To(Equal(""))
+
+		ctrName := "testctr"
+		session := podmanTest.Podman([]string{"create", "--name", ctrName, "-v", "/test", ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		list2 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list2.WaitWithDefaultTimeout()
+		Expect(list2.ExitCode()).To(Equal(0))
+		arr := list2.OutputToStringArray()
+		Expect(len(arr)).To(Equal(1))
+		Expect(arr[0]).To(Not(Equal("")))
+
+		remove := podmanTest.Podman([]string{"rm", "-v", ctrName})
+		remove.WaitWithDefaultTimeout()
+		Expect(remove.ExitCode()).To(Equal(0))
+
+		list3 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list3.WaitWithDefaultTimeout()
+		Expect(list3.ExitCode()).To(Equal(0))
+		Expect(list3.OutputToString()).To(Equal(""))
+	})
+
+	It("podman rm -v retains named volume", func() {
+		list1 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list1.WaitWithDefaultTimeout()
+		Expect(list1.ExitCode()).To(Equal(0))
+		Expect(list1.OutputToString()).To(Equal(""))
+
+		ctrName := "testctr"
+		volName := "testvol"
+		session := podmanTest.Podman([]string{"create", "--name", ctrName, "-v", fmt.Sprintf("%s:/test", volName), ALPINE, "top"})
+		session.WaitWithDefaultTimeout()
+		Expect(session.ExitCode()).To(Equal(0))
+
+		list2 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list2.WaitWithDefaultTimeout()
+		Expect(list2.ExitCode()).To(Equal(0))
+		arr := list2.OutputToStringArray()
+		Expect(len(arr)).To(Equal(1))
+		Expect(arr[0]).To(Equal(volName))
+
+		remove := podmanTest.Podman([]string{"rm", "-v", ctrName})
+		remove.WaitWithDefaultTimeout()
+		Expect(remove.ExitCode()).To(Equal(0))
+
+		list3 := podmanTest.Podman([]string{"volume", "list", "--quiet"})
+		list3.WaitWithDefaultTimeout()
+		Expect(list3.ExitCode()).To(Equal(0))
+		arr2 := list3.OutputToStringArray()
+		Expect(len(arr2)).To(Equal(1))
+		Expect(arr2[0]).To(Equal(volName))
+	})
 })
-- 
cgit v1.2.3-54-g00ecf