github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-09-27 05:03:41 +00:00
Code Issues Projects Releases Wiki Activity

Vendor after merging mtrmac/image:openpgp, + other updates

Browse Source 
Primarily vendor after merging mtrmac/image:openpgp.

Then update for the SigningMechanism API change.

Also skip signing tests if the GPG mechanism does not support signing.

Also abort some of the tests early instead of trying to use invalid (or
nil) values.

The current master of image-tools does not build with Go 1.6, so keep
using an older release.

Also requires adding a few more dependencies of our updated
dependencies.
This commit is contained in:
Miloslav Trmač
2017-03-20 15:29:26 +01:00
parent d2d41ebc33
commit 0caee746fb
98 changed files with 34047 additions and 1455 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
vendor/github.com/containers/storage/drivers/devmapper/deviceset.go generated vendored
View File

@@ -31,7 +31,7 @@ import (
"github.com/containers/storage/storageversion"
"github.com/docker/go-units"
"github.com/opencontainers/runc/libcontainer/label"
"github.com/opencontainers/selinux/go-selinux/label"
)
var (
@@ -2569,7 +2569,7 @@ func NewDeviceSet(root string, doInit bool, options []string, uidMaps, gidMaps [
devices.metaDataLoopbackSize = size
case "dm.fs":
if val != "ext4" && val != "xfs" {
return nil, fmt.Errorf("devmapper: Unsupported filesystem %s\n", val)
return nil, fmt.Errorf("devmapper: Unsupported filesystem %s", val)
}
devices.filesystem = val
case "dm.mkfsarg":
@@ -2631,9 +2631,9 @@ func NewDeviceSet(root string, doInit bool, options []string, uidMaps, gidMaps [
devices.minFreeSpacePercent = uint32(minFreeSpacePercent)
default:
if nthOption > len(defaults) {
return nil, fmt.Errorf("devmapper: Unknown option %s\n", key)
return nil, fmt.Errorf("devmapper: Unknown option %s", key)
}
logrus.Errorf("devmapper: Unknown option %s, ignoring\n", key)
logrus.Errorf("devmapper: Unknown option %s, ignoring", key)
}
settings[key] = val
}