Skip to content

Commit 68d1980

Browse files
authored
Merge pull request #52 from devtron-labs/dependa-fix
fix: upgraded to docker v27.2.0+incompatible
2 parents dc4a9fb + 839e19c commit 68d1980

File tree

237 files changed

+30200
-32256
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

237 files changed

+30200
-32256
lines changed

Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
FROM golang:1.20-alpine3.17 AS build-env
1+
FROM golang:1.21-alpine3.18 AS build-env
22
RUN apk add --no-cache git gcc musl-dev
33
RUN apk add --update make
44
RUN go install github.com/google/wire/cmd/wire@latest

go.mod

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
module github.com/devtron-labs/image-scanner
22

3-
go 1.20
3+
go 1.21
4+
5+
toolchain go1.22.3
46

57
require (
68
github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible
79
github.com/antihax/optional v1.0.0
810
github.com/aws/aws-sdk-go v1.44.116
911
github.com/caarlos0/env v3.5.0+incompatible
1012
github.com/caarlos0/env/v6 v6.10.1
11-
github.com/devtron-labs/common-lib v0.0.22-0.20240705073412-32e32c499160
13+
github.com/devtron-labs/common-lib v0.16.1-0.20240904133334-7918e7c25b63
1214
github.com/go-pg/pg v6.15.1+incompatible
1315
github.com/google/go-containerregistry v0.6.0
1416
github.com/google/wire v0.6.0
@@ -19,19 +21,18 @@ require (
1921
github.com/quay/claircore v1.3.1
2022
github.com/tidwall/gjson v1.14.4
2123
go.uber.org/zap v1.21.0
22-
golang.org/x/oauth2 v0.10.0
24+
golang.org/x/oauth2 v0.21.0
2325
)
2426

2527
require (
26-
cloud.google.com/go/compute v1.23.0 // indirect
27-
cloud.google.com/go/compute/metadata v0.2.3 // indirect
28+
cloud.google.com/go/compute/metadata v0.3.0 // indirect
2829
github.com/arl/statsviz v0.6.0 // indirect
2930
github.com/beorn7/perks v1.0.1 // indirect
3031
github.com/cespare/xxhash/v2 v2.2.0 // indirect
3132
github.com/coreos/clair v2.0.1-0.20171220021131-30bd568d8361+incompatible // indirect
3233
github.com/docker/cli v24.0.6+incompatible // indirect
3334
github.com/docker/distribution v2.8.2+incompatible // indirect
34-
github.com/docker/docker v24.0.9+incompatible // indirect
35+
github.com/docker/docker v27.2.0+incompatible // indirect
3536
github.com/docker/docker-credential-helpers v0.7.0 // indirect
3637
github.com/golang/mock v1.6.0 // indirect
3738
github.com/golang/protobuf v1.5.4 // indirect
@@ -58,14 +59,13 @@ require (
5859
github.com/tidwall/pretty v1.2.0 // indirect
5960
go.uber.org/atomic v1.10.0 // indirect
6061
go.uber.org/multierr v1.7.0 // indirect
61-
golang.org/x/crypto v0.21.0 // indirect
62-
golang.org/x/mod v0.14.0 // indirect
63-
golang.org/x/net v0.23.0 // indirect
64-
golang.org/x/sync v0.6.0 // indirect
65-
golang.org/x/sys v0.18.0 // indirect
66-
golang.org/x/text v0.14.0 // indirect
67-
golang.org/x/tools v0.17.0 // indirect
68-
google.golang.org/appengine v1.6.7 // indirect
62+
golang.org/x/crypto v0.25.0 // indirect
63+
golang.org/x/mod v0.17.0 // indirect
64+
golang.org/x/net v0.27.0 // indirect
65+
golang.org/x/sync v0.7.0 // indirect
66+
golang.org/x/sys v0.22.0 // indirect
67+
golang.org/x/text v0.16.0 // indirect
68+
golang.org/x/tools v0.21.1-0.20240508182429-e35e4ccd0d2d // indirect
6969
google.golang.org/genproto v0.0.0-20230803162519-f966b187b2e5 // indirect
7070
google.golang.org/genproto/googleapis/api v0.0.0-20230726155614-23370e0ffb3e // indirect
7171
google.golang.org/genproto/googleapis/rpc v0.0.0-20230822172742-b8732ec3820d // indirect

go.sum

Lines changed: 33 additions & 21 deletions
Large diffs are not rendered by default.

vendor/cloud.google.com/go/compute/LICENSE

Lines changed: 0 additions & 202 deletions
This file was deleted.

vendor/cloud.google.com/go/compute/internal/version.go

Lines changed: 0 additions & 18 deletions
This file was deleted.

vendor/cloud.google.com/go/compute/metadata/CHANGES.md

Lines changed: 7 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)