github/linuxkit
1
0
Fork 0
mirror of https://github.com/linuxkit/linuxkit.git synced 2025-07-20 17:49:10 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #2985 from justincormack/mobyup

Browse Source 
Update moby tool vendoring
This commit is contained in:
Justin Cormack 2018-04-04 20:09:52 +01:00 committed by GitHub
commit 5313f13d51
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/cmd/linuxkit/vendor.conf
View File

@ -26,7 +26,7 @@ github.com/moby/datakit 97b3d230535397a813323902c23751e176481a86
github.com/moby/hyperkit a285521725f44f3d10ca1042c2c07d3a6e24bed8
# When updating also:
# curl -fsSL -o src/cmd/linuxkit/build.go https://raw.githubusercontent.com/moby/tool/«hash»/cmd/moby/build.go
github.com/moby/tool 749585dd13ad043087556c8a341c1dc99041639f
github.com/moby/tool f1ae82c9eb338241cccd62443263498ae0461c2c
github.com/moby/vpnkit 0e4293bb1058598c4b0a406ed171f52573ef414c
github.com/opencontainers/go-digest 21dfd564fd89c944783d00d069f33e3e7123c448
github.com/opencontainers/image-spec v1.0.0

3
src/cmd/linuxkit/vendor/github.com/moby/tool/src/moby/config.go generated vendored
View File

@ -785,7 +785,8 @@ func ConfigInspectToOCI(yaml *Image, inspect types.ImageInspect, idMap map[strin
}
src := parts[0]
dest := parts[1]
opts := []string{"rw", "rbind", "rprivate"}
// default to rshared if not specified
opts := []string{"rw", "rbind", "rshared"}
if len(parts) == 3 {
opts = append(strings.Split(parts[2], ","), "rbind")
}