Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump github.com/docker/docker from 25.0.5+incompatible to 26.1.0+incompatible #744

Merged
merged 2 commits into from
Apr 24, 2024
Merged

Bump github.com/docker/docker from 25.0.5+incompatible to 26.1.0+incompatible #744

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2e59c59
Bump github.com/docker/docker
dependabot[bot] Apr 24, 2024
8d89dc9
getting rid of deprecated docker options/types
hilmarf Apr 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ require (
github.com/cyberphone/json-canonicalization v0.0.0-20231217050601-ba74d44ecf5f
github.com/distribution/reference v0.6.0
github.com/docker/cli v25.0.5+incompatible
github.com/docker/docker v25.0.5+incompatible
github.com/docker/docker v26.1.0+incompatible
github.com/docker/go-connections v0.5.0
github.com/drone/envsubst v1.0.3
github.com/fluxcd/cli-utils v0.36.0-flux.5
Expand Down Expand Up @@ -238,6 +238,7 @@ require (
github.com/mitchellh/go-wordwrap v1.0.1 // indirect
github.com/mitchellh/mapstructure v1.5.0 // indirect
github.com/mitchellh/reflectwalk v1.0.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/locker v1.0.1 // indirect
github.com/moby/spdystream v0.2.0 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
Expand Down
6 changes: 4 additions & 2 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -314,8 +314,8 @@ github.com/docker/cli v25.0.5+incompatible/go.mod h1:JLrzqnKDaYBop7H2jaqPtU4hHvM
github.com/docker/distribution v2.7.1+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/distribution v2.8.3+incompatible h1:AtKxIZ36LoNK51+Z6RpzLpddBirtxJnzDrHLEKxTAYk=
github.com/docker/distribution v2.8.3+incompatible/go.mod h1:J2gT2udsDAN96Uj4KfcMRqY0/ypR+oyYUYmja8H+y+w=
github.com/docker/docker v25.0.5+incompatible h1:UmQydMduGkrD5nQde1mecF/YnSbTOaPeFIeP5C4W+DE=
github.com/docker/docker v25.0.5+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker v26.1.0+incompatible h1:W1G9MPNbskA6VZWL7b3ZljTh0pXI68FpINx0GKaOdaM=
github.com/docker/docker v26.1.0+incompatible/go.mod h1:eEKB0N0r5NX/I1kEveEz05bcu8tLC/8azJZsviup8Sk=
github.com/docker/docker-credential-helpers v0.8.1 h1:j/eKUktUltBtMzKqmfLB0PAgqYyMHOp5vfsD1807oKo=
github.com/docker/docker-credential-helpers v0.8.1/go.mod h1:P3ci7E3lwkZg6XiHdRKft1KckHiO9a2rNtyFbZ/ry9M=
github.com/docker/go v1.5.1-1.0.20160303222718-d30aec9fd63c h1:lzqkGL9b3znc+ZUgi7FlLnqjQhcXxkNM/quxIjBVMD0=
Expand Down Expand Up @@ -711,6 +711,8 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
github.com/mittwald/go-helm-client v0.12.9 h1:tfI5ECgrbfAolA9TnlCeA5F2TEIvdsOxVmoSyW80lCI=
github.com/mittwald/go-helm-client v0.12.9/go.mod h1:ukR3Et5zbfBij7bFL1ZnLvPytsbBXCrI2qQYr2yVi9I=
github.com/moby/docker-image-spec v1.3.1 h1:jMKff3w6PgbfSa69GfNg+zN/XLhfXJGnEx3Nl2EsFP0=
github.com/moby/docker-image-spec v1.3.1/go.mod h1:eKmb5VW8vQEh/BAr2yvVNvuiJuY6UIocYsFu/DxxRpo=
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
Expand Down
8 changes: 2 additions & 6 deletions pkg/contexts/oci/repositories/docker/namespace.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,3 @@
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
//
// SPDX-License-Identifier: Apache-2.0

package docker

import (
Expand All @@ -11,7 +7,7 @@ import (

"github.com/containers/image/v5/image"
"github.com/containers/image/v5/types"
dockertypes "github.com/docker/docker/api/types"
dockertypes "github.com/docker/docker/api/types/image"
"github.com/mandelsoft/logging"
"github.com/opencontainers/go-digest"

Expand Down Expand Up @@ -131,7 +127,7 @@ func (n *namespaceContainer) GetBlobDescriptor(digest digest.Digest) *cpi.Descri
}

func (n *namespaceHandler) ListTags() ([]string, error) {
opts := dockertypes.ImageListOptions{}
opts := dockertypes.ListOptions{}
list, err := n.repo.client.ImageList(dummyContext, opts)
if err != nil {
return nil, err
Expand Down
10 changes: 3 additions & 7 deletions pkg/contexts/oci/repositories/docker/repository.go
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,14 +1,10 @@
// SPDX-FileCopyrightText: 2022 SAP SE or an SAP affiliate company and Open Component Model contributors.
//
// SPDX-License-Identifier: Apache-2.0

package docker

import (
"strings"

"github.com/containers/image/v5/types"
dockertypes "github.com/docker/docker/api/types"
dockertypes "github.com/docker/docker/api/types/image"
"github.com/docker/docker/client"

"github.com/open-component-model/ocm/pkg/contexts/oci/cpi"
Expand Down Expand Up @@ -75,7 +71,7 @@ func (r *RepositoryImpl) GetNamespaces(prefix string, closure bool) ([]string, e
}

func (r *RepositoryImpl) GetRepositories() ([]string, error) {
opts := dockertypes.ImageListOptions{}
opts := dockertypes.ListOptions{}
list, err := r.client.ImageList(dummyContext, opts)
if err != nil {
return nil, err
Expand Down Expand Up @@ -103,7 +99,7 @@ func (r *RepositoryImpl) ExistsArtifact(name string, version string) (bool, erro
if err != nil {
return false, err
}
opts := dockertypes.ImageListOptions{}
opts := dockertypes.ListOptions{}
opts.Filters.Add("reference", ref.StringWithinTransport())
list, err := r.client.ImageList(dummyContext, opts)
if err != nil {
Expand Down
9 changes: 5 additions & 4 deletions pkg/toi/drivers/docker/driver.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@ import (
"github.com/docker/cli/cli/command"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/image"
registrytypes "github.com/docker/docker/api/types/registry"
"github.com/docker/docker/client"
"github.com/docker/docker/pkg/jsonmessage"
Expand Down Expand Up @@ -152,8 +153,8 @@ func (d *Driver) SetContainerErr(w io.Writer) {
d.containerErr = w
}

func pullImage(ctx context.Context, cli command.Cli, image string) error {
ref, err := reference.ParseNormalizedNamed(image)
func pullImage(ctx context.Context, cli command.Cli, imageName string) error {
ref, err := reference.ParseNormalizedNamed(imageName)
if err != nil {
return fmt.Errorf("unable to parse normalized name: %w", err)
}
Expand All @@ -171,11 +172,11 @@ func pullImage(ctx context.Context, cli command.Cli, image string) error {
return fmt.Errorf("unable encode auth: %w", err)
}

options := types.ImagePullOptions{
options := image.PullOptions{
RegistryAuth: encodedAuth,
}

responseBody, err := cli.Client().ImagePull(ctx, image, options)
responseBody, err := cli.Client().ImagePull(ctx, imageName, options)
if err != nil {
return fmt.Errorf("unable to pull image: %w", err)
}
Expand Down
Loading