From e4e883701e46709f1f013da190e444e62a824262 Mon Sep 17 00:00:00 2001 From: Trapier Marshall Date: Thu, 7 Feb 2019 12:00:42 -0500 Subject: [PATCH 1/6] interlock does not ssl_only `com.docker.lb.ssl_only` is not recognized by Interlock Signed-off-by: Trapier Marshall --- ee/ucp/interlock/usage/labels-reference.md | 1 - 1 file changed, 1 deletion(-) diff --git a/ee/ucp/interlock/usage/labels-reference.md b/ee/ucp/interlock/usage/labels-reference.md index 51381ce142..bc5da8aef1 100644 --- a/ee/ucp/interlock/usage/labels-reference.md +++ b/ee/ucp/interlock/usage/labels-reference.md @@ -18,7 +18,6 @@ The following labels are available for you to use in swarm services: | `com.docker.lb.network` | Name of network the proxy service should attach to for upstream connectivity. | `app-network-a` | | `com.docker.lb.context_root` | Context or path to use for the application. | `/app` | | `com.docker.lb.context_root_rewrite` | Boolean to enable rewrite for the context root. | `true` | -| `com.docker.lb.ssl_only` | Boolean to force SSL for application. | `true` | | `com.docker.lb.ssl_cert` | Docker secret to use for the SSL certificate. | `example.com.cert` | | `com.docker.lb.ssl_key` | Docker secret to use for the SSL key. | `example.com.key` | | `com.docker.lb.websocket_endpoints` | Comma separated list of endpoints to configure to be upgraded for websockets. | `/ws,/foo` | From b00aeb1c850463d4b35cb0bccc37114428b291af Mon Sep 17 00:00:00 2001 From: jondkent Date: Thu, 7 Feb 2019 19:45:59 +0000 Subject: [PATCH 2/6] Updated as certicate as expire in documented version The current documentation points to use a version of notary which has an expired certicate. Updated the version of notary_autobuilds to 0.5.1 from 0.4.2. Change the shared volume to notarycerts:/var/lib/notary/fixtures from notarycerts:/go/src/github.com/docker/notary/fixtures as location of certificate has changed. --- engine/security/trust/trust_sandbox.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/engine/security/trust/trust_sandbox.md b/engine/security/trust/trust_sandbox.md index 6cfbf8a326..65551042c9 100644 --- a/engine/security/trust/trust_sandbox.md +++ b/engine/security/trust/trust_sandbox.md @@ -77,9 +77,9 @@ the `trustsandbox` container, the Notary server, and the Registry server. version: "2" services: notaryserver: - image: dockersecurity/notary_autobuilds:server-v0.4.2 + image: dockersecurity/notary_autobuilds:server-v0.5.1 volumes: - - notarycerts:/go/src/github.com/docker/notary/fixtures + - notarycerts:/var/lib/notary/fixtures networks: - sandbox environment: From 6668b3f1b23c1a92d35ecc50fc7706b4d592c824 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Wed, 6 Feb 2019 17:12:00 -0800 Subject: [PATCH 3/6] Fixes issue 8141 --- datacenter/dtr/2.5/reference/cli/destroy.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/datacenter/dtr/2.5/reference/cli/destroy.md b/datacenter/dtr/2.5/reference/cli/destroy.md index e6219aba0b..f3a84067f1 100644 --- a/datacenter/dtr/2.5/reference/cli/destroy.md +++ b/datacenter/dtr/2.5/reference/cli/destroy.md @@ -20,9 +20,9 @@ docker run -it --rm docker/dtr \ This command forcefully removes all containers and volumes associated with a DTR replica without notifying the rest of the cluster. Use this command -on all replicas uninstall DTR. +on all replicas to uninstall DTR. -Use the 'remove' command to gracefully scale down your DTR cluster. +Use `docker/dtr remove` to gracefully scale down your DTR cluster. ## Options From bf8223e08b5699a8ef25f425ad986ee5ecbd19ec Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Wed, 6 Feb 2019 17:30:06 -0800 Subject: [PATCH 4/6] Fixes 7798 --- ee/ucp/admin/backups-and-disaster-recovery.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ee/ucp/admin/backups-and-disaster-recovery.md b/ee/ucp/admin/backups-and-disaster-recovery.md index 3e5be6d0b1..fb487b0aa8 100644 --- a/ee/ucp/admin/backups-and-disaster-recovery.md +++ b/ee/ucp/admin/backups-and-disaster-recovery.md @@ -37,7 +37,7 @@ Back up your Docker EE components in the following order: 1. [Back up your swarm](/engine/swarm/admin_guide/#back-up-the-swarm) 2. Back up UCP -3. [Back up DTR](../../dtr/2.5/admin/disaster-recovery/index.md) +3. [Back up DTR](/ee/dtr/admin/disaster-recovery/) ## Backup policy From e7849b828431c3c1371f175702c15e822462aca8 Mon Sep 17 00:00:00 2001 From: Maria Bermudez Date: Wed, 6 Feb 2019 17:59:11 -0800 Subject: [PATCH 5/6] Update description of private collection Fixes issue within internal repo --- ee/ucp/authorization/group-resources.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/ucp/authorization/group-resources.md b/ee/ucp/authorization/group-resources.md index 50b57f6b1d..ff43863a9a 100644 --- a/ee/ucp/authorization/group-resources.md +++ b/ee/ucp/authorization/group-resources.md @@ -57,8 +57,8 @@ Docker EE provides a number of built-in collections. | `/` | Path to all resources in the Swarm cluster. Resources not in a collection are put here. | | `/System` | Path to UCP managers, DTR nodes, and UCP/DTR system services. By default, only admins have access, but this is configurable. | | `/Shared` | Default path to all worker nodes for scheduling. In Docker EE Standard, all worker nodes are located here. In [Docker EE Advanced](https://www.docker.com/enterprise-edition), worker nodes can be moved and [isolated](isolate-nodes.md). | -| `/Shared/Private/` | Path to a user's private collection. | -| `/Shared/Legacy` | Path to the access control labels of legacy versions (UCP 2.1 and lower). | +| `/Shared/Private/` | Path to a user's private collection. Note that private collections are not created until the user logs in for the first time. | +| `/Shared/Legacy` | Path to the access control labels of legacy versions (UCP 2.1 and lower). | ### Default collections From 2e76849c8e5c3ede67f687cd3829c8326005de27 Mon Sep 17 00:00:00 2001 From: jondkent Date: Thu, 7 Feb 2019 19:45:59 +0000 Subject: [PATCH 6/6] Updated as certicate as expire in documented version The current documentation points to use a version of notary which has an expired certicate. Updated the version of notary_autobuilds to 0.5.1 from 0.4.2. Change the shared volume to notarycerts:/var/lib/notary/fixtures from notarycerts:/go/src/github.com/docker/notary/fixtures as location of certificate has changed.