toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

vendor: docker/docker aaf470eca7b588aa19e6681bff8bf08d17be1bf2

Browse Source 
full diff: 41ac6bef8d...aaf470eca7

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn
2020-06-15 11:26:48 +02:00
parent c5c6fb1cd4
commit 0d57a400b3
12 changed files with 69 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
cli/command/service/opts.go
View File

@ -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(),
},

2
cli/command/service/update.go
View File

@ -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{}

2
cli/command/service/update_test.go
View File

@ -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,
},