Skip to content

feat: relative parent paths on bind mount src#4966

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
thaJeztah merged 1 commit into from
May 22, 2025
Merged

feat: relative parent paths on bind mount src #4966

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion cli/command/container/opts.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -375,7 +375,7 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con

if parsed.Type == string(mounttypes.TypeBind) {
if hostPart, targetPath, ok := strings.Cut(bind, ":"); ok {
if strings.HasPrefix(hostPart, "."+string(filepath.Separator)) || hostPart == "." {
if !filepath.IsAbs(hostPart) && strings.HasPrefix(hostPart, ".") {

@akerouantonakerouantonMar 13, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure we need to match . prefix. If there's a rationale behind that, could you expand on that please? 🙂 Also note that, this prefix matching will include hidden files too.

I think this should be just fine:

Suggested change
if!filepath.IsAbs(hostPart) &&strings.HasPrefix(hostPart, ".") {
if!filepath.IsAbs(hostPart) {

@BenehikoBenehikoMar 14, 2025•
edited
Loading

Copy link
Copy Markdown
MemberAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

AFAIK (see PR description)

This prefix (.) is always required for source since the -v/--volume/--mount flags also support setting named volumes.

@akerouantonakerouantonMar 14, 2025

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Oh, indeed! 🙈 And looking at the constraints for volume names, we don't allow them to start with a dot. So all good I guess!

$ docker volume create .a Error response from daemon: create .a: ".a" includes invalid characters for a local volume name, only "[a-zA-Z0-9][a-zA-Z0-9_.-]" are allowed. If you intended to pass a host directory, use absolute path

if absHostPart, err := filepath.Abs(hostPart); err == nil {
hostPart = absHostPart
}
Expand Down
2 changes: 1 addition & 1 deletion opts/mount.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -100,7 +100,7 @@ func (m *MountOpt) Set(value string) error {
mount.Type = mounttypes.Type(strings.ToLower(val))
case "source", "src":
mount.Source = val
if strings.HasPrefix(val, "."+string(filepath.Separator)) || val == "." {
if !filepath.IsAbs(val) && strings.HasPrefix(val, ".") {
if abs, err := filepath.Abs(val); err == nil {
mount.Source = abs
}
Expand Down
13 changes: 12 additions & 1 deletion opts/mount_test.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -39,11 +39,22 @@ func TestMountRelative(t *testing.T) {
name: "Current path",
path: ".",
bind: "type=bind,source=.,target=/target",
}, {
},
{
name: "Current path with slash",
path: "./",
bind: "type=bind,source=./,target=/target",
},
{
name: "Parent path with slash",
path: "../",
bind: "type=bind,source=../,target=/target",
},
{
name: "Parent path",
path: "..",
bind: "type=bind,source=..,target=/target",
},
} {
t.Run(testcase.name, func(t *testing.T) {
var mount MountOpt
Expand Down