-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
universe/skopeo: enable Docker Client API version negotiation
Updating a vendored dependency to enable Docker Client API version negotiation: containers/image#2260 and, in particular, make skopeo work with Docker 25.
- Loading branch information
1 parent
caa28a5
commit 8c9add5
Showing
2 changed files
with
38 additions
and
2 deletions.
There are no files selected for viewing
32 changes: 32 additions & 0 deletions
32
universe/skopeo/0100-Enable-docker-api-version-negotiation.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,32 @@ | ||
Update a vendored dependency to enable Docker client API | ||
version negotiation. | ||
|
||
Upstream PR: | ||
|
||
https://github.com/containers/image/pull/2260 | ||
|
||
diff --git a/vendor/github.com/containers/image/v5/docker/daemon/client.go b/vendor/github.com/containers/image/v5/docker/daemon/client.go | ||
index 2c245f5..354af21 100644 | ||
--- a/vendor/github.com/containers/image/v5/docker/daemon/client.go | ||
+++ b/vendor/github.com/containers/image/v5/docker/daemon/client.go | ||
@@ -9,11 +9,6 @@ import ( | ||
"github.com/docker/go-connections/tlsconfig" | ||
) | ||
|
||
-const ( | ||
- // The default API version to be used in case none is explicitly specified | ||
- defaultAPIVersion = "1.22" | ||
-) | ||
- | ||
// NewDockerClient initializes a new API client based on the passed SystemContext. | ||
func newDockerClient(sys *types.SystemContext) (*dockerclient.Client, error) { | ||
host := dockerclient.DefaultDockerHost | ||
@@ -23,7 +18,7 @@ func newDockerClient(sys *types.SystemContext) (*dockerclient.Client, error) { | ||
|
||
opts := []dockerclient.Opt{ | ||
dockerclient.WithHost(host), | ||
- dockerclient.WithVersion(defaultAPIVersion), | ||
+ dockerclient.WithAPIVersionNegotiation(), | ||
} | ||
|
||
// We conditionalize building the TLS configuration only to TLS sockets: |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters