Skip to content

Support for relative path in bind mounts#1273

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

Closed
matthewwo wants to merge 4 commits into from
Closed

Support for relative path in bind mounts #1273

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
e07ce97
Support for relative path in bind mounts
matthewwo Aug 4, 2018
026fef4
fix no readonly and consistency flags in bind mount
matthewwo Aug 5, 2018
89fea8a
Merge branch 'master' into 1203-relative-bind-mounts
matthewwo Sep 11, 2019
0e347a2
fix rw / ro flag issue
matthewwo Oct 3, 2019
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
21 changes: 18 additions & 3 deletions cli/command/container/opts.go
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -15,6 +15,7 @@ import (
"github.com/docker/cli/cli/compose/loader"
"github.com/docker/cli/opts"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/mount"
networktypes "github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/strslice"
"github.com/docker/docker/api/types/versions"
Expand DownExpand Up@@ -343,12 +344,26 @@ func parse(flags *pflag.FlagSet, copts *containerOptions, serverOS string) (*con
for bind := range copts.volumes.GetMap() {
parsed, _ := loader.ParseVolume(bind)
if parsed.Source != "" {
// after creating the bind mount we want to delete it from the copts.volumes values because
// we do not want bind mounts being committed to image configs
binds = append(binds, bind)
// We should delete from the map (`volumes`) here, as deleting from copts.volumes will not work if
// there are duplicates entries.
delete(volumes, bind)

if parsed.Type == string(mount.TypeBind) {
// Resolve relative path of source volume if needed
resolved, err := resolveLocalPath(parsed.Source)
if err != nil {
return nil, err
}

parts := strings.Split(bind, ":")
parts[0] = resolved

bind = strings.Join(parts[:], ":")
}

// after creating the bind mount we want to delete it from the copts.volumes values because
// we do not want bind mounts being committed to image configs
binds = append(binds, bind)
}
}

Expand Down