github/skopeo
1
0
Fork 0
mirror of https://github.com/containers/skopeo.git synced 2025-10-24 13:21:27 +00:00
Code Issues Projects Releases Wiki Activity

Vendor containers/storage, update containers/image

Browse Source 
Vendor containers/storage, and its dependencies github.com/pborman/uuid
and github.com/mistifyio/go-zfs, which we didn't already use.

Update the build Dockerfile to install their dependencies.

Add scriptlets that try to detect whether or not we need to use the
"libdm_no_deferred_remove" and/or "btrfs_noversion" build tags.

Signed-off-by: Nalin Dahyabhai <nalin@redhat.com>
This commit is contained in:
Nalin Dahyabhai
2016-08-31 12:56:00 -04:00
parent 9ba6dd71d7
commit 4960f390e2
259 changed files with 28030 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
vendor/github.com/containers/image/docker/docker_client.go generated vendored
View File

@@ -17,7 +17,7 @@ import (
"github.com/Sirupsen/logrus"
"github.com/containers/image/types"
"github.com/docker/docker/pkg/homedir"
"github.com/containers/storage/pkg/homedir"
"github.com/docker/go-connections/sockets"
"github.com/docker/go-connections/tlsconfig"
)
@@ -428,7 +428,7 @@ func (c *dockerClient) ping() (*pingResponse, error) {
}
if err != nil {
err = fmt.Errorf("pinging docker registry returned %+v", err)
if c.ctx.DockerDisableV1Ping {
if c.ctx != nil && c.ctx.DockerDisableV1Ping {
return nil, err
}
// best effort to understand if we're talking to a V1 registry