Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
8 changes: 0 additions & 8 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -72,14 +72,6 @@ jobs:
name: Install test/lint dependencies
command: make setup

- run:
name: Validate dependency vendoring
command: |
git fetch origin
if test -n "`git diff --stat=1000 origin/master | grep -E \"^[[:space:]]*vendor\"`"; then
make dep-validate;
fi

# The GOPATH setting would not be needed if we used the golang docker image
- run:
name: Compile/lint/vet/protobuf validation
Expand Down
1,048 changes: 1,048 additions & 0 deletions go.sum

Large diffs are not rendered by default.

81 changes: 81 additions & 0 deletions vendor.mod
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
module github.com/docker/swarmkit

go 1.17

require (
code.cloudfoundry.org/clock v1.0.0
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

did this one work with v1.0.0 ? I recalled they tagged 1.0.0 (without v prefix, and therefore go modules didn't see that as a release); https://github.com/cloudfoundry/clock/releases/tag/1.0.0

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

They've made two tags actually 1.0.0 and v1.0.0: https://github.com/cloudfoundry/clock/tags

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

oh 🤦 how did I miss that? Perhaps I'm confused with another repository

github.com/Microsoft/go-winio v0.4.17
github.com/akutz/memconn v0.1.1-0.20180504174903-e0a19f53d865
github.com/cloudflare/cfssl v0.0.0-20180323000720-5d63dbd981b5
github.com/container-storage-interface/spec v1.2.0
github.com/coreos/etcd v3.3.25+incompatible
github.com/docker/distribution v2.7.1+incompatible
github.com/docker/docker v20.10.3-0.20210720110456-471fd2770977+incompatible
Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

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

Haven't checked, so just a random comment; did you manually specify the same commits (and/or versions) for each of these, or just let go modules find versions? (I expect "some" will be upgraded through indirect dependencies, which we can't prevent, but as long as we're mostly at the same version, that would be great (and we can handle upgrades later where we see fit)

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

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

I didn't specify anything, I put exact commands in commit messages...

github.com/docker/go-connections v0.4.0
github.com/docker/go-events v0.0.0-20190806004212-e31b211e4f1c
github.com/docker/go-metrics v0.0.1
github.com/docker/go-units v0.4.0
github.com/dustin/go-humanize v1.0.0
github.com/fernet/fernet-go v0.0.0-20180830025343-9eac43b88a5e
github.com/gogo/protobuf v1.3.2
github.com/golang/protobuf v1.4.3
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
github.com/hashicorp/go-memdb v0.0.0-20161216180745-cb9a474f84cc
github.com/onsi/ginkgo v1.12.1
github.com/onsi/gomega v1.10.3
github.com/opencontainers/go-digest v1.0.0
github.com/opencontainers/image-spec v1.0.1
github.com/phayes/permbits v0.0.0-20160117212716-f7e3ac5e859d
github.com/pkg/errors v0.9.1
github.com/prometheus/client_golang v1.7.1
github.com/rcrowley/go-metrics v0.0.0-20160113235030-51425a2415d2
github.com/rexray/gocsi v1.2.1
github.com/sirupsen/logrus v1.7.0
github.com/spf13/cobra v1.1.3
github.com/spf13/pflag v1.0.5
github.com/stretchr/testify v1.6.1
go.etcd.io/bbolt v1.3.5
golang.org/x/crypto v0.0.0-20210322153248-0c34fe9e7dc2
golang.org/x/net v0.0.0-20210226172049-e18ecbb05110
golang.org/x/time v0.0.0-20200630173020-3af7569d3a1e
google.golang.org/grpc v1.33.2
)

require (
github.com/akutz/gosync v0.1.0 // indirect
github.com/beorn7/perks v1.0.1 // indirect
github.com/cespare/xxhash/v2 v2.1.1 // indirect
github.com/containerd/containerd v1.5.2 // indirect
github.com/coreos/go-semver v0.3.0 // indirect
github.com/coreos/go-systemd v0.0.0-20190612170431-362f06ec6bc1 // indirect
github.com/coreos/pkg v0.0.0-20180928190104-399ea9e2e55f // indirect
github.com/davecgh/go-spew v1.1.1 // indirect
github.com/docker/libkv v0.2.2-0.20180912205406-458977154600 // indirect
github.com/fsnotify/fsnotify v1.4.9 // indirect
github.com/google/certificate-transparency-go v1.0.20 // indirect
github.com/google/uuid v1.2.0 // indirect
github.com/hashicorp/go-immutable-radix v1.0.0 // indirect
github.com/hashicorp/golang-lru v0.5.3 // indirect
github.com/hpcloud/tail v1.0.0 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
github.com/ishidawataru/sctp v0.0.0-20210226210310-f2269e66cdee // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.2-0.20181231171920-c182affec369 // indirect
github.com/nxadm/tail v1.4.4 // indirect
github.com/opencontainers/runc v1.0.0-rc95 // indirect
github.com/pmezard/go-difflib v1.0.0 // indirect
github.com/prometheus/client_model v0.2.0 // indirect
github.com/prometheus/common v0.10.0 // indirect
github.com/prometheus/procfs v0.6.0 // indirect
go.uber.org/atomic v1.6.0 // indirect
go.uber.org/multierr v1.5.0 // indirect
go.uber.org/zap v1.10.0 // indirect
golang.org/x/sys v0.0.0-20210823070655-63515b42dcdf // indirect
golang.org/x/text v0.3.4 // indirect
golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1 // indirect
google.golang.org/genproto v0.0.0-20201110150050-8816d57aaa9a // indirect
google.golang.org/protobuf v1.25.0 // indirect
gopkg.in/fsnotify.v1 v1.4.7 // indirect
gopkg.in/tomb.v1 v1.0.0-20141024135613-dd632973f1e7 // indirect
gopkg.in/yaml.v2 v2.4.0 // indirect
gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c // indirect
)
1 change: 1 addition & 0 deletions vendor/github.com/Microsoft/go-winio/.gitignore

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

1 change: 1 addition & 0 deletions vendor/github.com/Microsoft/go-winio/CODEOWNERS

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

36 changes: 24 additions & 12 deletions vendor/github.com/Microsoft/go-winio/fileinfo.go

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

9 changes: 0 additions & 9 deletions vendor/github.com/Microsoft/go-winio/go.mod

This file was deleted.

2 changes: 2 additions & 0 deletions vendor/github.com/Microsoft/go-winio/hvsock.go

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

4 changes: 2 additions & 2 deletions vendor/github.com/Microsoft/go-winio/pipe.go

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

2 changes: 2 additions & 0 deletions vendor/github.com/Microsoft/go-winio/pkg/guid/guid.go

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

2 changes: 1 addition & 1 deletion vendor/github.com/Microsoft/go-winio/syscall.go

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

Loading