Skip to content

Commit c0e6da7

Browse files
thaJeztahthaJeztah
authored
Merge pull request moby#34061 from cyli/re-vendor-swarmkit
Re-vendor swarmkit.
2 parents e5862d4 + 4509a00 commit c0e6da7

File tree

34 files changed

+1155
-734
lines changed

34 files changed

+1155
-734
lines changed

‎daemon/cluster/executor/container/container.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,7 +77,7 @@ func (c *containerConfig) setTask(t *api.Task) error {
7777
c.task = t
7878

7979
if t.Spec.GetContainer() != nil {
80-
preparedSpec, err := template.ExpandContainerSpec(t)
80+
preparedSpec, err := template.ExpandContainerSpec(nil, t)
8181
if err != nil {
8282
return err
8383
}

‎vendor.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -106,7 +106,7 @@ github.com/stevvooe/continuity cd7a8e21e2b6f84799f5dd4b65faf49c8d3ee02d
106106
github.com/tonistiigi/fsutil 0ac4c11b053b9c5c7c47558f81f96c7100ce50fb
107107

108108
# cluster
109-
github.com/docker/swarmkit 79381d0840be27f8b3f5c667b348a4467d866eeb
109+
github.com/docker/swarmkit a3d96fe13e30e46c3d4cfc3f316ebdd8446a079d
110110
github.com/gogo/protobuf v0.4
111111
github.com/cloudflare/cfssl 7fb22c8cba7ecaf98e4082d22d65800cf45e042a
112112
github.com/google/certificate-transparency d90e65c3a07988180c5b1ece71791c0b6506826e

‎vendor/github.com/docker/swarmkit/agent/storage.go

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

‎vendor/github.com/docker/swarmkit/api/genericresource/helpers.go

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

‎vendor/github.com/docker/swarmkit/api/genericresource/resource_management.go

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

‎vendor/github.com/docker/swarmkit/api/genericresource/string.go

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

‎vendor/github.com/docker/swarmkit/api/genericresource/validate.go

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

0 commit comments

Comments
 (0)