From 854b996d36ee8f805b3b4b435b6411e0b8f3a97e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Pawe=C5=82=20Gronowski?= <pawel.gronowski@docker.com>
Date: Wed, 24 Jan 2024 14:15:49 +0100
Subject: [PATCH] mount: Add `volume-subpath` option
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: Paweł Gronowski <pawel.gronowski@docker.com>
---
 e2e/container/run_test.go | 38 ++++++++++++++++++++++++++++++++++++++
 opts/mount.go             |  2 ++
 2 files changed, 40 insertions(+)

diff --git a/e2e/container/run_test.go b/e2e/container/run_test.go
index 3f110156ed70..9b1b79a18d85 100644
--- a/e2e/container/run_test.go
+++ b/e2e/container/run_test.go
@@ -2,6 +2,7 @@ package container
 
 import (
 	"fmt"
+	"strings"
 	"testing"
 
 	"github.com/docker/cli/e2e/internal/fixtures"
@@ -149,3 +150,40 @@ func TestRunWithCgroupNamespace(t *testing.T) {
 		"/bin/grep", "-q", "':memory:/$'", "/proc/1/cgroup")
 	result.Assert(t, icmd.Success)
 }
+
+func TestMountSubvolume(t *testing.T) {
+	t.SkipNow() // TODO: Enable when testing against 1.45+
+	volName := "test-volume-" + t.Name()
+	icmd.RunCommand("docker", "volume", "create", volName).Assert(t, icmd.Success)
+
+	t.Cleanup(func() {
+		icmd.RunCommand("docker", "volume", "remove", "-f", volName).Assert(t, icmd.Success)
+	})
+
+	defaultMountOpts := []string{
+		"type=volume",
+		"src=" + volName,
+		"dst=/volume",
+	}
+
+	// Populate the volume with test data.
+	icmd.RunCommand("docker", "run", "--mount", strings.Join(defaultMountOpts, ","), fixtures.AlpineImage, "sh", "-c",
+		"echo foo > /volume/bar.txt && "+
+			"mkdir /volume/subdir && echo world > /volume/subdir/hello.txt;",
+	).Assert(t, icmd.Success)
+
+	runMount := func(cmd string, mountOpts ...string) *icmd.Result {
+		mountArg := strings.Join(append(defaultMountOpts, mountOpts...), ",")
+		return icmd.RunCommand("docker", "run", "--mount", mountArg, fixtures.AlpineImage, cmd, "/volume")
+	}
+
+	t.Run("subpath not exists", func(t *testing.T) {
+		runMount("ls", "volume-subpath=some-path/that/doesnt-exist").Assert(t, icmd.Expected{Err: "cannot access path ", ExitCode: 125})
+	})
+	t.Run("subdirectory mount", func(t *testing.T) {
+		runMount("ls", "volume-subpath=subdir").Assert(t, icmd.Expected{Out: "hello.txt"})
+	})
+	t.Run("file mount", func(t *testing.T) {
+		runMount("cat", "volume-subpath=bar.txt").Assert(t, icmd.Expected{Out: "foo"})
+	})
+}
diff --git a/opts/mount.go b/opts/mount.go
index 3ab9b36d64cc..430b858e8fae 100644
--- a/opts/mount.go
+++ b/opts/mount.go
@@ -131,6 +131,8 @@ func (m *MountOpt) Set(value string) error {
 				return fmt.Errorf("invalid value for %s: %s (must be \"enabled\", \"disabled\", \"writable\", or \"readonly\")",
 					key, val)
 			}
+		case "volume-subpath":
+			volumeOptions().Subpath = val
 		case "volume-nocopy":
 			volumeOptions().NoCopy, err = strconv.ParseBool(val)
 			if err != nil {