THIS IS A TEST INSTANCE ONLY! REPOSITORIES CAN BE DELETED AT ANY TIME!

Browse Source

docker: Bump docker dependencies, add containerd

These dependencies are maintained because the upstream repos bundle
vendor directories into the repos, which cause namespacing issues during
build. Git submodules don't strip the vendor directory whereas most
vendoring tools would.

Signed-off-by: Joe Groocock <me@frebib.net>
pull/631/head
Joe Groocock 3 months ago
parent
commit
6a61774fb7
No known key found for this signature in database GPG Key ID: E0B16BEACFBB6A86
  1. 6
      .gitmodules
  2. 2
      engine/resources/docker_container.go
  3. 1
      engine/resources/docker_container_test.go
  4. 1
      vendor/github.com/containerd/containerd
  5. 2
      vendor/github.com/docker/distribution
  6. 2
      vendor/github.com/docker/docker
  7. 1
      vendor/github.com/docker/go-connections

6
.gitmodules

@ -28,9 +28,9 @@
[submodule "vendor/github.com/purpleidea/distribution"]
path = vendor/github.com/docker/distribution
url = https://github.com/purpleidea/distribution
[submodule "vendor/github.com/purpleidea/go-connections"]
path = vendor/github.com/docker/go-connections
url = https://github.com/docker/go-connections
[submodule "vendor/github.com/hashicorp/go-multierror"]
path = vendor/github.com/hashicorp/go-multierror
url = https://github.com/hashicorp/go-multierror
[submodule "vendor/github.com/containerd/containerd"]
path = vendor/github.com/containerd/containerd
url = https://github.com/purpleidea/containerd

2
engine/resources/docker_container.go

@ -310,7 +310,7 @@ func (obj *DockerContainerRes) CheckApply(apply bool) (bool, error) {
}
}
c, err := obj.client.ContainerCreate(ctx, containerConfig, hostConfig, nil, obj.Name())
c, err := obj.client.ContainerCreate(ctx, containerConfig, hostConfig, nil, nil, obj.Name())
if err != nil {
return false, errwrap.Wrapf(err, "error creating container")
}

1
engine/resources/docker_container_test.go

@ -165,6 +165,7 @@ func setup() error {
},
&container.HostConfig{},
nil,
nil,
"mgmt-test",
)
if err != nil {

1
vendor/github.com/containerd/containerd

@ -0,0 +1 @@
Subproject commit 231d09c8988e17f10853232bdee2441a4b4f3541

2
vendor/github.com/docker/distribution

@ -1 +1 @@
Subproject commit 05e9759077b787f60951a2ea12136d6f4933296e
Subproject commit a778dab7d0f94fcd7950a8eb439fa1accb445839

2
vendor/github.com/docker/docker

@ -1 +1 @@
Subproject commit 445197336ebfc341fe1c922410324422b5722328
Subproject commit 6c6f9d8cf0bae08f7c91c6794906eba3ebac9205

1
vendor/github.com/docker/go-connections

@ -1 +0,0 @@
Subproject commit 97c2040d34dfae1d1b1275fa3a78dbdd2f41cf7e
Loading…
Cancel
Save