github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-26 12:44:55 +00:00
Code Issues Projects Releases Wiki Activity

Vendor c/image after merging vrothberg/image:regsv2-docker

Browse Source 
Also update the user and tests for the API change.
This commit is contained in:
Miloslav Trmač
2017-07-11 15:44:25 +02:00
parent 5dec940523
commit 72468d6817
279 changed files with 11349 additions and 114493 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
vendor/github.com/containers/storage/drivers/windows/windows.go generated vendored
View File

@@ -362,11 +362,14 @@ func (d *Driver) Remove(id string) error {
}
// Get returns the rootfs path for the id. This will mount the dir at its given path.
func (d *Driver) Get(id, mountLabel string, uidMaps, gidMaps []idtools.IDMap) (string, error) {
func (d *Driver) Get(id string, options graphdriver.MountOpts) (string, error) {
panicIfUsedByLcow()
logrus.Debugf("WindowsGraphDriver Get() id %s mountLabel %s", id, mountLabel)
logrus.Debugf("WindowsGraphDriver Get() id %s mountLabel %s", id, options.MountLabel)
var dir string
if len(options.Options) > 0 {
return "", fmt.Errorf("windows driver does not support mount options")
}
rID, err := d.resolveID(id)
if err != nil {
return "", err
@@ -620,7 +623,7 @@ func (d *Driver) DiffSize(id string, idMappings *idtools.IDMappings, parent stri
return
}
layerFs, err := d.Get(id, "", nil, nil)
layerFs, err := d.Get(id, graphdriver.MountOpts{})
if err != nil {
return
}