Skip to content
This repository was archived by the owner on Nov 27, 2023. It is now read-only.

Bump buildx and docker vendoring #1012

Merged
chris-crone merged 3 commits into from
Dec 11, 2020
Merged

Bump buildx and docker vendoring #1012

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6e76aad
deps: Bump buildx and docker vendoring
chris-crone Dec 4, 2020
ddaec1a
compose.build: Wait for progress writer after build
chris-crone Dec 10, 2020
87153b9
local.compose.build: Ensure images are exported
chris-crone Dec 11, 2020
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
39 changes: 15 additions & 24 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,20 +2,6 @@ module github.com/docker/compose-cli

go 1.15

// the distribution version from ecs plugin is quite old and it breaks containerd
Copy link
Copy Markdown
Contributor

@rumpl rumpl Dec 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

You got me, I thought all were removed, but you just moved them below! :D

Copy link
Copy Markdown
Contributor Author

@chris-crone chris-crone Dec 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I tried to make it cleaner :)

Copy link
Copy Markdown
Contributor Author

@chris-crone chris-crone Dec 4, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I bumped docker to v20.10.0-rc2 so this should now be a bit cleaner.

// we need to create a new release tag for docker/distribution
replace github.com/docker/distribution => github.com/docker/distribution v0.0.0-20200708230824-53e18a9d9bfe

// (for buildx)
replace github.com/containerd/containerd => github.com/containerd/containerd v1.3.1-0.20200227195959-4d242818bf55

replace github.com/docker/docker => github.com/docker/docker v17.12.0-ce-rc1.0.20200730172259-9f28837c1d93+incompatible

replace github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305

// unix.SYS_IOCTL has been removed from golang/sys but still in use by docker/docker until 20.x
replace golang.org/x/sys => golang.org/x/sys v0.0.0-20200826173525-f9321e4c35a6

require (
github.com/AlecAivazis/survey/v2 v2.2.3
github.com/Azure/azure-sdk-for-go v48.2.0+incompatible
Expand All @@ -26,21 +12,18 @@ require (
github.com/Azure/go-autorest/autorest/azure/cli v0.4.2
github.com/Azure/go-autorest/autorest/date v0.3.0
github.com/Azure/go-autorest/autorest/to v0.4.0
github.com/Azure/go-autorest/autorest/validation v0.2.0 // indirect
github.com/Microsoft/go-winio v0.4.15
github.com/Microsoft/hcsshim v0.8.10 // indirect
github.com/aws/aws-sdk-go v1.35.33
github.com/awslabs/goformation/v4 v4.15.6
github.com/buger/goterm v0.0.0-20200322175922-2f3e71b85129
github.com/compose-spec/compose-go v0.0.0-20201210155915-b5ef325e9175
github.com/containerd/console v1.0.1
github.com/containerd/containerd v1.4.0-0
github.com/containerd/containerd v1.4.3
github.com/containerd/continuity v0.0.0-20200928162600-f2cc35102c2a // indirect
github.com/docker/buildx v0.4.2
github.com/docker/cli v0.0.0-20200528204125-dd360c7c0de8
github.com/docker/distribution v2.7.1-0.20190205005809-0d3efadf0154+incompatible
github.com/docker/docker v17.12.0-ce-rc1.0.20200916142827-bd33bbf0497b+incompatible
github.com/docker/docker-credential-helpers v0.6.3 // indirect
github.com/docker/buildx v0.5.0-rc1
github.com/docker/cli v20.10.0+incompatible
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.0+incompatible
github.com/docker/go-connections v0.4.0
github.com/docker/go-units v0.4.0
github.com/gobwas/httphead v0.0.0-20180130184737-2c6c146eadee // indirect
Expand All @@ -49,13 +32,13 @@ require (
github.com/golang/mock v1.4.4
github.com/golang/protobuf v1.4.3
github.com/google/go-cmp v0.5.4
github.com/gorilla/mux v1.7.4 // indirect
github.com/hashicorp/go-multierror v1.1.0
github.com/hashicorp/go-uuid v1.0.2
github.com/iancoleman/strcase v0.1.2
github.com/joho/godotenv v1.3.0
github.com/labstack/echo v3.3.10+incompatible
github.com/labstack/gommon v0.3.0 // indirect
github.com/moby/buildkit v0.8.1-0.20201205083753-0af7b1b9c693
github.com/moby/term v0.0.0-20201110203204-bea5bbe245bf
github.com/morikuni/aec v1.0.0
github.com/opencontainers/go-digest v1.0.0
Expand All @@ -74,8 +57,16 @@ require (
golang.org/x/sync v0.0.0-20201020160332-67f06af15bc9
google.golang.org/grpc v1.33.2
google.golang.org/protobuf v1.25.0
gopkg.in/check.v1 v1.0.0-20190902080502-41f04d3bba15 // indirect
gopkg.in/ini.v1 v1.62.0
gotest.tools v2.2.0+incompatible
gotest.tools/v3 v3.0.3
)

replace (
// the distribution version from ecs plugin is quite old and it breaks containerd
// we need to create a new release tag for docker/distribution
github.com/docker/distribution => github.com/docker/distribution v0.0.0-20200708230824-53e18a9d9bfe

// (for buildx)
github.com/jaguilar/vt100 => github.com/tonistiigi/vt100 v0.0.0-20190402012908-ad4c4a574305
)
Loading