vendor: docker/docker aaf470eca7b588aa19e6681bff8bf08d17be1bf2

full diff: moby/moby@41ac6be...aaf470e Signed-off-by: Sebastiaan van Stijn <[email protected]> Upstream-commit: 0d57a400b35b6929fe0e331e8c8ae1484418211d Component: cli
isFire · Jun 15, 2020 · ba70eb4 · ba70eb4
1 parent aa26a4d
commit ba70eb4
Show file tree

Hide file tree

Showing 12 changed files with 69 additions and 41 deletions.
diff --git a/components/cli/cli/command/service/opts.go b/components/cli/cli/command/service/opts.go
@@ -237,7 +237,7 @@ func (r *resourceOptions) ToResourceRequirements() (*swarm.ResourceRequirements,
 	}
 
 	return &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
+		Limits: &swarm.Limit{
 			NanoCPUs:    r.limitCPU.Value(),
 			MemoryBytes: r.limitMemBytes.Value(),
 		},

diff --git a/components/cli/cli/command/service/update.go b/components/cli/cli/command/service/update.go
@@ -312,7 +312,7 @@ func updateService(ctx context.Context, apiClient client.NetworkAPIClient, flags
 			task.Resources = &swarm.ResourceRequirements{}
 		}
 		if task.Resources.Limits == nil {
-			task.Resources.Limits = &swarm.Resources{}
+			task.Resources.Limits = &swarm.Limit{}
 		}
 		if task.Resources.Reservations == nil {
 			task.Resources.Reservations = &swarm.Resources{}

diff --git a/components/cli/cli/command/service/update_test.go b/components/cli/cli/command/service/update_test.go
@@ -656,7 +656,7 @@ func TestUpdateLimitsReservations(t *testing.T) {
 		TaskTemplate: swarm.TaskSpec{
 			ContainerSpec: &swarm.ContainerSpec{},
 			Resources: &swarm.ResourceRequirements{
-				Limits: &swarm.Resources{
+				Limits: &swarm.Limit{
 					NanoCPUs:    1000000000,
 					MemoryBytes: 104857600,
 				},

diff --git a/components/cli/cli/compose/convert/service.go b/components/cli/cli/compose/convert/service.go
@@ -531,7 +531,7 @@ func convertResources(source composetypes.Resources) (*swarm.ResourceRequirement
 				return nil, err
 			}
 		}
-		resources.Limits = &swarm.Resources{
+		resources.Limits = &swarm.Limit{
 			NanoCPUs:    cpus,
 			MemoryBytes: int64(source.Limits.MemoryBytes),
 		}

diff --git a/components/cli/cli/compose/convert/service_test.go b/components/cli/cli/compose/convert/service_test.go
@@ -87,7 +87,7 @@ func TestConvertResourcesFull(t *testing.T) {
 	assert.NilError(t, err)
 
 	expected := &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
+		Limits: &swarm.Limit{
 			NanoCPUs:    3000000,
 			MemoryBytes: 300000000,
 		},
@@ -112,7 +112,7 @@ func TestConvertResourcesOnlyMemory(t *testing.T) {
 	assert.NilError(t, err)
 
 	expected := &swarm.ResourceRequirements{
-		Limits: &swarm.Resources{
+		Limits: &swarm.Limit{
 			MemoryBytes: 300000000,
 		},
 		Reservations: &swarm.Resources{

diff --git a/components/cli/vendor.conf b/components/cli/vendor.conf
@@ -12,7 +12,7 @@ github.com/creack/pty                               3a6a957789163cacdfe0e291617a
 github.com/davecgh/go-spew                          8991bc29aa16c548c550c7ff78260e27b9ab7c73 # v1.1.1
 github.com/docker/compose-on-kubernetes             78e6a00beda64ac8ccb9fec787e601fe2ce0d5bb # v0.5.0-alpha1
 github.com/docker/distribution                      0d3efadf0154c2b8a4e7b6621fff9809655cc580
-github.com/docker/docker                            41ac6bef8d449b3064ad1378a28d95c79c4b9350
+github.com/docker/docker                            aaf470eca7b588aa19e6681bff8bf08d17be1bf2
 github.com/docker/docker-credential-helpers         54f0238b6bf101fc3ad3b34114cb5520beb562f5 # v0.6.3
 github.com/docker/go                                d30aec9fd63c35133f8f79c3412ad91a3b08be06 # Contains a customized version of canonical/json and is used by Notary. The package is periodically rebased on current Go versions.
 github.com/docker/go-connections                    7395e3f8aa162843a74ed6d48e79627d9792ac55 # v0.4.0

diff --git a/components/cli/vendor/github.com/docker/docker/api/types/network/network.go b/components/cli/vendor/github.com/docker/docker/api/types/network/network.go
diff --git a/components/cli/vendor/github.com/docker/docker/api/types/swarm/container.go b/components/cli/vendor/github.com/docker/docker/api/types/swarm/container.go
diff --git a/components/cli/vendor/github.com/docker/docker/api/types/swarm/task.go b/components/cli/vendor/github.com/docker/docker/api/types/swarm/task.go
diff --git a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools.go
diff --git a/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go b/components/cli/vendor/github.com/docker/docker/pkg/idtools/idtools_unix.go
diff --git a/components/cli/vendor/github.com/docker/docker/vendor.conf b/components/cli/vendor/github.com/docker/docker/vendor.conf