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

chore: update docker-credential-gcr to use v2 #3026

Merged
merged 1 commit into from
Feb 26, 2024
Merged

chore: update docker-credential-gcr to use v2 #3026

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion deploy/Dockerfile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ COPY . .
# Then submit a PR with the changes to `go.mod`, `go.sum`, and `vendor`.

# Get GCR credential helper
RUN go install github.com/GoogleCloudPlatform/docker-credential-gcr
RUN go install github.com/GoogleCloudPlatform/docker-credential-gcr/v2

# Get Amazon ECR credential helper
RUN go install github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login
Expand Down
3 changes: 2 additions & 1 deletion go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
module github.com/GoogleContainerTools/kaniko

go 1.19
go 1.21

require (
cloud.google.com/go/storage v1.38.0
Expand Down Expand Up @@ -156,6 +156,7 @@ require (
github.com/Azure/azure-sdk-for-go v68.0.0+incompatible // indirect
github.com/Azure/azure-sdk-for-go/sdk/azcore v1.9.2 // indirect
github.com/Azure/azure-sdk-for-go/sdk/internal v1.5.2 // indirect
github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22 // indirect
github.com/Microsoft/hcsshim v0.11.0 // indirect
github.com/aws/aws-sdk-go-v2/service/ecr v1.24.5 // indirect
github.com/aws/aws-sdk-go-v2/service/ecrpublic v1.21.5 // indirect
Expand Down
2 changes: 2 additions & 0 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,6 +55,8 @@ github.com/BurntSushi/toml v0.3.1/go.mod h1:xHWCNGjB5oqiDr8zfno3MHue2Ht5sIBksp03
github.com/BurntSushi/toml v1.2.1/go.mod h1:CxXYINrC8qIiEnFrOxCa7Jy5BFHlXnUU2pbicEuybxQ=
github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512 h1:cauzkEqKnOXwl0L5futNq6BbWWtIRPfJtwDDulac6A8=
github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512/go.mod h1:6u40niDQl1ufFtykax72lx+pcIO67AoUSu9ebOzdA8Q=
github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22 h1:HevuUpLsTedep2D6wnIp6AAJbVgP0BiVxaMt3HXeOyA=
github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22/go.mod h1:nzCpg7DFIIkQIZB3mdUPXVvqQ5f/GahA6xgWXTjnK7w=
github.com/Microsoft/go-winio v0.5.2/go.mod h1:WpS1mjBmmwHBEWmogvA2mj8546UReBk4v8QkMxJ6pZY=
github.com/Microsoft/go-winio v0.6.1 h1:9/kr64B9VUZrLm5YYwbGtUJnMgqWVOdUAXu6Migciow=
github.com/Microsoft/go-winio v0.6.1/go.mod h1:LRdKpFKfdobln8UmuiYcKPot9D2v6svN5+sAH+4kjUM=
Expand Down
2 changes: 1 addition & 1 deletion tools/tools.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ package tools
// dependencies https://github.com/golang/go/issues/48332
// These are placeholder imports the make go mod include these tools in its dependency graph.
import (
_ "github.com/GoogleCloudPlatform/docker-credential-gcr"
_ "github.com/GoogleCloudPlatform/docker-credential-gcr/v2"
_ "github.com/awslabs/amazon-ecr-credential-helper/ecr-login/cli/docker-credential-ecr-login"
_ "github.com/chrismellard/docker-credential-acr-env"
)
0 ...Platform/docker-credential-gcr/.gitignore → ...tform/docker-credential-gcr/v2/.gitignore
View file
Open in desktop
File renamed without changes.
0 ...orm/docker-credential-gcr/.goreleaser.yml → .../docker-credential-gcr/v2/.goreleaser.yml
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...CloudPlatform/docker-credential-gcr/BUILD → ...udPlatform/docker-credential-gcr/v2/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...orm/docker-credential-gcr/CONTRIBUTING.md → .../docker-credential-gcr/v2/CONTRIBUTING.md
View file
Open in desktop
File renamed without changes.
0 ...oudPlatform/docker-credential-gcr/LICENSE → ...Platform/docker-credential-gcr/v2/LICENSE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...dPlatform/docker-credential-gcr/README.md → ...atform/docker-credential-gcr/v2/README.md
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...dPlatform/docker-credential-gcr/WORKSPACE → ...atform/docker-credential-gcr/v2/WORKSPACE
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...Platform/docker-credential-gcr/auth/BUILD → ...tform/docker-credential-gcr/v2/auth/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...tform/docker-credential-gcr/auth/login.go → ...rm/docker-credential-gcr/v2/auth/login.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...dPlatform/docker-credential-gcr/cli/BUILD → ...atform/docker-credential-gcr/v2/cli/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...atform/docker-credential-gcr/cli/clear.go → ...orm/docker-credential-gcr/v2/cli/clear.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...tform/docker-credential-gcr/cli/common.go → ...rm/docker-credential-gcr/v2/cli/common.go
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...tform/docker-credential-gcr/cli/config.go → ...rm/docker-credential-gcr/v2/cli/config.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...er-credential-gcr/cli/configure-docker.go → ...credential-gcr/v2/cli/configure-docker.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 3 additions & 3 deletions ...docker-credential-gcr/cli/dockerHelper.go → ...ker-credential-gcr/v2/cli/dockerHelper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...rm/docker-credential-gcr/cli/gcr-login.go → ...docker-credential-gcr/v2/cli/gcr-login.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...m/docker-credential-gcr/cli/gcr-logout.go → ...ocker-credential-gcr/v2/cli/gcr-logout.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...form/docker-credential-gcr/cli/version.go → ...m/docker-credential-gcr/v2/cli/version.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...atform/docker-credential-gcr/config/BUILD → ...orm/docker-credential-gcr/v2/config/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

23 changes: 17 additions & 6 deletions ...orm/docker-credential-gcr/config/const.go → .../docker-credential-gcr/v2/config/const.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...form/docker-credential-gcr/config/file.go → ...m/docker-credential-gcr/v2/config/file.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...rm/docker-credential-gcr/credhelper/BUILD → ...docker-credential-gcr/v2/credhelper/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

39 changes: 35 additions & 4 deletions ...ocker-credential-gcr/credhelper/helper.go → ...er-credential-gcr/v2/credhelper/helper.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...oudPlatform/docker-credential-gcr/main.go → ...Platform/docker-credential-gcr/v2/main.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...latform/docker-credential-gcr/store/BUILD → ...form/docker-credential-gcr/v2/store/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions ...form/docker-credential-gcr/store/store.go → ...m/docker-credential-gcr/v2/store/store.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...Platform/docker-credential-gcr/util/BUILD → ...tform/docker-credential-gcr/v2/util/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion ...form/docker-credential-gcr/util/cmd/BUILD → ...m/docker-credential-gcr/v2/util/cmd/BUILD
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

0 ...rm/docker-credential-gcr/util/cmd/exec.go → ...docker-credential-gcr/v2/util/cmd/exec.go
View file
Open in desktop
File renamed without changes.
0 ...atform/docker-credential-gcr/util/util.go → ...orm/docker-credential-gcr/v2/util/util.go
View file
Open in desktop
File renamed without changes.
18 changes: 10 additions & 8 deletions vendor/modules.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -107,14 +107,16 @@ github.com/Azure/go-autorest/logger
github.com/Azure/go-autorest/tracing
# github.com/GoogleCloudPlatform/docker-credential-gcr v1.5.1-0.20230328182921-62afb2723512
## explicit; go 1.17
github.com/GoogleCloudPlatform/docker-credential-gcr
github.com/GoogleCloudPlatform/docker-credential-gcr/auth
github.com/GoogleCloudPlatform/docker-credential-gcr/cli
github.com/GoogleCloudPlatform/docker-credential-gcr/config
github.com/GoogleCloudPlatform/docker-credential-gcr/credhelper
github.com/GoogleCloudPlatform/docker-credential-gcr/store
github.com/GoogleCloudPlatform/docker-credential-gcr/util
github.com/GoogleCloudPlatform/docker-credential-gcr/util/cmd
# github.com/GoogleCloudPlatform/docker-credential-gcr/v2 v2.1.22
## explicit; go 1.21
github.com/GoogleCloudPlatform/docker-credential-gcr/v2
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/auth
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/cli
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/config
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/credhelper
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/store
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/util
github.com/GoogleCloudPlatform/docker-credential-gcr/v2/util/cmd
# github.com/Microsoft/go-winio v0.6.1
## explicit; go 1.17
github.com/Microsoft/go-winio
Expand Down
Loading