Merge pull request #232 from thaJeztah/19.03_backport_lb_stale_force_leave
[19.03 backport] Network not deleted after stack is removed
diff --git a/api/swagger.yaml b/api/swagger.yaml
index b129ed7..fb980dd 100644
--- a/api/swagger.yaml
+++ b/api/swagger.yaml
@@ -1141,6 +1141,7 @@
type: "object"
additionalProperties:
type: "array"
+ x-nullable: true
items:
$ref: "#/definitions/PortBinding"
example:
@@ -1165,7 +1166,6 @@
PortBinding represents a binding between a host IP address and a host
port.
type: "object"
- x-nullable: true
properties:
HostIp:
description: "Host IP address that the container's port is mapped to."
@@ -5462,7 +5462,7 @@
/containers/{id}/resize:
post:
summary: "Resize a container TTY"
- description: "Resize the TTY for a container. You must restart the container for the resize to take effect."
+ description: "Resize the TTY for a container."
operationId: "ContainerResize"
consumes:
- "application/octet-stream"
@@ -9106,7 +9106,9 @@
type: "string"
RemoteAddrs:
description: "Addresses of manager nodes already participating in the swarm."
- type: "string"
+ type: "array"
+ items:
+ type: "string"
JoinToken:
description: "Secret token for joining this swarm."
type: "string"
diff --git a/builder/builder-next/executor_unix.go b/builder/builder-next/executor_unix.go
index 132b928..620ffb4 100644
--- a/builder/builder-next/executor_unix.go
+++ b/builder/builder-next/executor_unix.go
@@ -31,6 +31,7 @@
CommandCandidates: []string{"runc"},
DefaultCgroupParent: cgroupParent,
Rootless: rootless,
+ NoPivot: os.Getenv("DOCKER_RAMDISK") != "",
}, networkProviders)
}
diff --git a/daemon/cluster/executor/container/container.go b/daemon/cluster/executor/container/container.go
index abbd6bf..a768d9d 100644
--- a/daemon/cluster/executor/container/container.go
+++ b/daemon/cluster/executor/container/container.go
@@ -6,7 +6,6 @@
"net"
"strconv"
"strings"
- "time"
"github.com/sirupsen/logrus"
@@ -31,10 +30,6 @@
)
const (
- // Explicitly use the kernel's default setting for CPU quota of 100ms.
- // https://www.kernel.org/doc/Documentation/scheduler/sched-bwc.txt
- cpuQuotaPeriod = 100 * time.Millisecond
-
// systemLabelPrefix represents the reserved namespace for system labels.
systemLabelPrefix = "com.docker.swarm"
)
@@ -451,9 +446,7 @@
}
if r.Limits.NanoCPUs > 0 {
- // CPU Period must be set in microseconds.
- resources.CPUPeriod = int64(cpuQuotaPeriod / time.Microsecond)
- resources.CPUQuota = r.Limits.NanoCPUs * resources.CPUPeriod / 1e9
+ resources.NanoCPUs = r.Limits.NanoCPUs
}
return resources
diff --git a/internal/test/environment/environment.go b/internal/test/environment/environment.go
index 828c94d..9bec844 100644
--- a/internal/test/environment/environment.go
+++ b/internal/test/environment/environment.go
@@ -78,10 +78,13 @@
}
case "windows":
baseImage := "microsoft/windowsservercore"
- if override := os.Getenv("WINDOWS_BASE_IMAGE"); override != "" {
- baseImage = override
- fmt.Println("INFO: Windows Base image is ", baseImage)
+ if overrideBaseImage := os.Getenv("WINDOWS_BASE_IMAGE"); overrideBaseImage != "" {
+ baseImage = overrideBaseImage
+ if overrideBaseImageTag := os.Getenv("WINDOWS_BASE_IMAGE_TAG"); overrideBaseImageTag != "" {
+ baseImage = baseImage + ":" + overrideBaseImageTag
+ }
}
+ fmt.Println("INFO: Windows Base image is ", baseImage)
return PlatformDefaults{
BaseImage: baseImage,
VolumesConfigPath: filepath.FromSlash(volumesPath),
