From 8cfc8c01d684a34b4936839a5fcbfbbd74b0d575 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Mon, 29 May 2023 19:05:31 +0000 Subject: [PATCH 1/2] Bump github.com/docker/docker Bumps [github.com/docker/docker](https://github.com/docker/docker) from 23.0.6+incompatible to 24.0.2+incompatible. - [Release notes](https://github.com/docker/docker/releases) - [Commits](https://github.com/docker/docker/compare/v23.0.6...v24.0.2) --- updated-dependencies: - dependency-name: github.com/docker/docker dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- go.mod | 2 +- go.sum | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/go.mod b/go.mod index 886ff2081..ea8edcde6 100644 --- a/go.mod +++ b/go.mod @@ -4,7 +4,7 @@ go 1.18 require ( github.com/docker/distribution v2.8.2+incompatible - github.com/docker/docker v23.0.6+incompatible + github.com/docker/docker v24.0.2+incompatible github.com/equinix-labs/otel-init-go v0.0.7 github.com/go-logr/logr v1.2.4 github.com/go-logr/zapr v1.2.4 diff --git a/go.sum b/go.sum index 24bb917fa..3c3f459f2 100644 --- a/go.sum +++ b/go.sum @@ -325,8 +325,8 @@ github.com/dgryski/go-lttb v0.0.0-20180810165845-318fcdf10a77/go.mod h1:Va5MyIzk github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8PWV+bWy6jNmig1y/TA+kYO4g3RSRF0IAv0no= github.com/docker/distribution v2.8.2+incompatible h1:T3de5rq0dB1j30rp0sA2rER+m322EBzniBPB6ZIzuh8= github.com/docker/distribution v2.8.2+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w= -github.com/docker/docker v23.0.6+incompatible h1:aBD4np894vatVX99UTx/GyOUOK4uEcROwA3+bQhEcoU= -github.com/docker/docker v23.0.6+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= +github.com/docker/docker v24.0.2+incompatible h1:eATx+oLz9WdNVkQrr0qjQ8HvRJ4bOOxfzEo8R+dA3cg= +github.com/docker/docker v24.0.2+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk= github.com/docker/go-connections v0.4.0 h1:El9xVISelRB7BuFusrZozjnkIM5YnzCViNKohAFqRJQ= github.com/docker/go-connections v0.4.0/go.mod h1:Gbd7IOopHjR8Iph03tsViu4nIes5XhDvyHbTtUxmeec= github.com/docker/go-units v0.5.0 h1:69rxXcBk27SvSaaxTtLh/8llcHD8vYHT7WSdRZ/jvr4= From 1e89d1b0762ec2c72cd95637fafef175eeab6096 Mon Sep 17 00:00:00 2001 From: Chris Doherty Date: Mon, 29 May 2023 14:27:18 -0500 Subject: [PATCH 2/2] Patch code for docker 24.0.2 update Signed-off-by: Chris Doherty --- cmd/tink-worker/worker/registry.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmd/tink-worker/worker/registry.go b/cmd/tink-worker/worker/registry.go index 02609a80b..0eda49a44 100644 --- a/cmd/tink-worker/worker/registry.go +++ b/cmd/tink-worker/worker/registry.go @@ -8,6 +8,7 @@ import ( "path" "github.com/docker/docker/api/types" + "github.com/docker/docker/api/types/registry" "github.com/pkg/errors" ) @@ -32,7 +33,7 @@ type ImagePullStatus struct { // PullImage outputs to stdout the contents of the requested image (relative to the registry). func (m *containerManager) PullImage(ctx context.Context, image string) error { l := m.getLogger(ctx) - authConfig := types.AuthConfig{ + authConfig := registry.AuthConfig{ Username: m.registryDetails.Username, Password: m.registryDetails.Password, ServerAddress: m.registryDetails.Registry,