Browse code

Merge pull request #211 from thaJeztah/19.03_backport_api_fixes

[19.03 backport] backport small API fixes

Sebastiaan van Stijn authored on 2019/05/24 05:50:12
Showing 12 changed files
... ...
@@ -463,10 +463,6 @@ definitions:
463 463
         type: "array"
464 464
         items:
465 465
           $ref: "#/definitions/DeviceRequest"
466
-      DiskQuota:
467
-        description: "Disk limit (in bytes)."
468
-        type: "integer"
469
-        format: "int64"
470 466
       KernelMemory:
471 467
         description: "Kernel memory limit in bytes."
472 468
         type: "integer"
... ...
@@ -1,4 +1,4 @@
1
-package {{ .Package }}
1
+package {{ .Package }} // import "github.com/docker/docker/api/types/{{ .Package }}"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package container
1
+package container // import "github.com/docker/docker/api/types/container"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package container
1
+package container // import "github.com/docker/docker/api/types/container"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package container
1
+package container // import "github.com/docker/docker/api/types/container"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package container
1
+package container // import "github.com/docker/docker/api/types/container"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package container
1
+package container // import "github.com/docker/docker/api/types/container"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -338,7 +338,6 @@ type Resources struct {
338 338
 	Devices              []DeviceMapping // List of devices to map inside the container
339 339
 	DeviceCgroupRules    []string        // List of rule to be added to the device cgroup
340 340
 	DeviceRequests       []DeviceRequest // List of device requests for device drivers
341
-	DiskQuota            int64           // Disk limit (in bytes)
342 341
 	KernelMemory         int64           // Kernel memory limit (in bytes)
343 342
 	KernelMemoryTCP      int64           // Hard limit for kernel TCP buffer memory (in bytes)
344 343
 	MemoryReservation    int64           // Memory soft limit (in bytes)
... ...
@@ -1,4 +1,4 @@
1
-package image
1
+package image // import "github.com/docker/docker/api/types/image"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package volume
1
+package volume // import "github.com/docker/docker/api/types/volume"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -1,4 +1,4 @@
1
-package volume
1
+package volume // import "github.com/docker/docker/api/types/volume"
2 2
 
3 3
 // ----------------------------------------------------------------------------
4 4
 // DO NOT EDIT THIS FILE
... ...
@@ -153,7 +153,6 @@ func (container *Container) UpdateContainer(hostConfig *containertypes.HostConfi
153 153
 		resources.CpusetMems != "" ||
154 154
 		len(resources.Devices) != 0 ||
155 155
 		len(resources.DeviceCgroupRules) != 0 ||
156
-		resources.DiskQuota != 0 ||
157 156
 		resources.KernelMemory != 0 ||
158 157
 		resources.MemoryReservation != 0 ||
159 158
 		resources.MemorySwap != 0 ||