Skip to content

Commit

Permalink
Merge pull request #340 from adevinta/update-deps
Browse files Browse the repository at this point in the history 
go.mod: update direct dependencies
  • Loading branch information
@jroimartin
jroimartin authored Aug 23, 2024
2 parents be8f067 + 9a302e2 commit c421956
Show file tree
Hide file tree
Showing 3 changed files with 100 additions and 76 deletions.
22 changes: 11 additions & 11 deletions backend/docker/docker.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,9 @@ import (
"github.com/docker/cli/cli/command"
dockercliconfig "github.com/docker/cli/cli/config"
"github.com/docker/cli/cli/flags"
"github.com/docker/docker/api/types"
"github.com/docker/docker/api/types/container"
"github.com/docker/docker/api/types/filters"
"github.com/docker/docker/api/types/image"
"github.com/docker/docker/api/types/network"
"github.com/docker/docker/api/types/registry"
"github.com/docker/docker/client"
Expand Down Expand Up @@ -454,8 +454,8 @@ func (b *Docker) getContainerlogs(ID string) ([]byte, error) {
return out, nil
}

func (b *Docker) imageExists(ctx context.Context, image string) (bool, error) {
domain, path, tag, err := backend.ParseImage(image)
func (b *Docker) imageExists(ctx context.Context, img string) (bool, error) {
domain, path, tag, err := backend.ParseImage(img)
if err != nil {
return false, err
}
Expand All @@ -467,7 +467,7 @@ func (b *Docker) imageExists(ctx context.Context, image string) (bool, error) {
pattern = path + ":" + tag
}

images, err := b.cli.ImageList(ctx, types.ImageListOptions{
images, err := b.cli.ImageList(ctx, image.ListOptions{
Filters: filters.NewArgs(filters.KeyValuePair{
Key: "reference",
Value: pattern,
Expand All @@ -482,23 +482,23 @@ func (b *Docker) imageExists(ctx context.Context, image string) (bool, error) {
return true, nil
}

func (b *Docker) pull(ctx context.Context, image string) error {
func (b *Docker) pull(ctx context.Context, img string) error {
if b.config.PullPolicy == config.PullPolicyNever {
return nil
}
if b.config.PullPolicy == config.PullPolicyIfNotPresent {
exists, err := b.imageExists(ctx, image)
exists, err := b.imageExists(ctx, img)
if err != nil {
return err
}
if exists {
return nil
}
}
pullOpts := types.ImagePullOptions{}
pullOpts := image.PullOptions{}

// Image was validated before and ParseImage always return a domain.
domain, _, _, err := backend.ParseImage(image)
domain, _, _, err := backend.ParseImage(img)
if err != nil {
return err
}
Expand All @@ -510,10 +510,10 @@ func (b *Docker) pull(ctx context.Context, image string) error {
}
pullOpts.RegistryAuth = base64.URLEncoding.EncodeToString(buf)
}
b.log.Debugf("pulling image=%s domain=%s auth=%v", image, domain, pullOpts.RegistryAuth != "")
b.log.Debugf("pulling image=%s domain=%s auth=%v", img, domain, pullOpts.RegistryAuth != "")
start := time.Now()
err = b.retryer.WithRetries("PullDockerImage", func() error {
respBody, err := b.cli.ImagePull(ctx, image, pullOpts)
respBody, err := b.cli.ImagePull(ctx, img, pullOpts)
if err != nil {
return err
}
Expand All @@ -525,7 +525,7 @@ func (b *Docker) pull(ctx context.Context, image string) error {
})
b.log.Infof(
"pulled image=%s domain=%s auth=%v duration=%f err=%v",
image,
img,
domain,
pullOpts.RegistryAuth != "",
time.Since(start).Seconds(),
Expand Down
42 changes: 27 additions & 15 deletions go.mod
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,10 +6,10 @@ require (
github.com/BurntSushi/toml v1.4.0
github.com/adevinta/vulcan-metrics-client v1.0.1
github.com/adevinta/vulcan-report v1.0.0
github.com/aws/aws-sdk-go v1.55.0
github.com/aws/aws-sdk-go v1.55.5
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/cli v27.1.2+incompatible
github.com/docker/docker v27.1.2+incompatible
github.com/docker/go-connections v0.5.0
github.com/google/go-cmp v0.6.0
github.com/google/uuid v1.6.0
Expand All @@ -24,7 +24,8 @@ require (
github.com/DataDog/datadog-go v4.8.3+incompatible // indirect
github.com/Microsoft/go-winio v0.5.2 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/cenkalti/backoff/v4 v4.3.0 // indirect
github.com/cespare/xxhash/v2 v2.2.0 // indirect
github.com/containerd/log v0.1.0 // indirect
github.com/docker/distribution v2.8.3+incompatible // indirect
github.com/docker/docker-credential-helpers v0.6.4 // indirect
Expand All @@ -33,15 +34,17 @@ require (
github.com/docker/go-units v0.4.0 // indirect
github.com/felixge/httpsnoop v1.0.4 // indirect
github.com/fvbommel/sortorder v1.1.0 // indirect
github.com/go-logr/logr v1.4.1 // indirect
github.com/go-logr/logr v1.4.2 // indirect
github.com/go-logr/stdr v1.2.2 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.5.3 // indirect
github.com/golang/protobuf v1.5.4 // indirect
github.com/gorilla/mux v1.8.0 // indirect
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 // indirect
github.com/inconshreveable/mousetrap v1.1.0 // indirect
github.com/jmespath/go-jmespath v0.4.0 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
github.com/miekg/pkcs11 v1.0.2 // indirect
github.com/moby/docker-image-spec v1.3.1 // indirect
github.com/moby/sys/sequential v0.5.0 // indirect
github.com/moby/term v0.0.0-20210619224110-3f7ff695adc6 // indirect
github.com/morikuni/aec v1.0.0 // indirect
Expand All @@ -56,16 +59,25 @@ require (
github.com/spf13/pflag v1.0.5 // indirect
github.com/theupdateframework/notary v0.7.0 // indirect
go.opentelemetry.io/contrib/instrumentation/net/http/otelhttp v0.48.0 // indirect
go.opentelemetry.io/otel v1.23.1 // indirect
go.opentelemetry.io/otel v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlpmetric/otlpmetricgrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracegrpc v1.28.0 // indirect
go.opentelemetry.io/otel/exporters/otlp/otlptrace/otlptracehttp v1.23.1 // indirect
go.opentelemetry.io/otel/metric v1.23.1 // indirect
go.opentelemetry.io/otel/sdk v1.23.1 // indirect
go.opentelemetry.io/otel/trace v1.23.1 // indirect
golang.org/x/crypto v0.21.0 // indirect
golang.org/x/net v0.23.0 // indirect
golang.org/x/sys v0.18.0 // indirect
golang.org/x/term v0.18.0 // indirect
go.opentelemetry.io/otel/metric v1.28.0 // indirect
go.opentelemetry.io/otel/sdk v1.28.0 // indirect
go.opentelemetry.io/otel/sdk/metric v1.28.0 // indirect
go.opentelemetry.io/otel/trace v1.28.0 // indirect
go.opentelemetry.io/proto/otlp v1.3.1 // indirect
golang.org/x/crypto v0.24.0 // indirect
golang.org/x/net v0.26.0 // indirect
golang.org/x/sys v0.21.0 // indirect
golang.org/x/term v0.21.0 // indirect
golang.org/x/text v0.16.0 // indirect
golang.org/x/time v0.0.0-20220411224347-583f2d630306 // indirect
google.golang.org/protobuf v1.33.0 // indirect
google.golang.org/genproto/googleapis/api v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/genproto/googleapis/rpc v0.0.0-20240701130421-f6361c86f094 // indirect
google.golang.org/grpc v1.64.0 // indirect
google.golang.org/protobuf v1.34.2 // indirect
gotest.tools/v3 v3.2.0 // indirect
)
Loading

0 comments on commit c421956

Please sign in to comment.