From a12e460932c6521fc3d0c6cf618a1f0b62a078b9 Mon Sep 17 00:00:00 2001 From: Trapier Marshall Date: Thu, 7 Feb 2019 12:00:42 -0500 Subject: [PATCH 1/2] 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 ebbceda772966166186a3f77bb2384f2052607bb Mon Sep 17 00:00:00 2001 From: jondkent Date: Thu, 7 Feb 2019 19:45:59 +0000 Subject: [PATCH 2/2] 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: