docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/docker.github.io

This commit is contained in:
Maria Bermudez 2019-02-07 13:12:28 -08:00
parent 43a2c7f4f0 f3eced1b01
commit 7a070210fd
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
ee/ucp/interlock/usage/labels-reference.md
View File

@ -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.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` | 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.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_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.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` | | `com.docker.lb.websocket_endpoints` | Comma separated list of endpoints to configure to be upgraded for websockets. | `/ws,/foo` |

4
engine/security/trust/trust_sandbox.md
View File

@ -77,9 +77,9 @@ the `trustsandbox` container, the Notary server, and the Registry server.
version: "2" version: "2"
services: services:
notaryserver: notaryserver:
image: dockersecurity/notary_autobuilds:server-v0.4.2 image: dockersecurity/notary_autobuilds:server-v0.5.1
volumes: volumes:
- notarycerts:/go/src/github.com/docker/notary/fixtures - notarycerts:/var/lib/notary/fixtures
networks: networks:
- sandbox - sandbox
environment: environment: