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

Merge pull request #8351 from docker/master 

Sync published with master
This commit is contained in:
paigehargrave 2019-02-25 18:34:55 -05:00 committed by GitHub
parent 068382112d a6a8f07273
commit 8a5fc288bc
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 8 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
config/containers/logging/json-file.md
View File

@ -13,6 +13,10 @@ and writes them in files using the JSON format. The JSON format annotates each l
origin (`stdout` or `stderr`) and its timestamp. Each log file contains information about
only one container.
```json
{"log":"Log line is here\n","stream":"stdout","time":"2019-01-01T11:11:11.111111111Z"}
```
## Usage
To use the `json-file` driver as the default logging driver, set the `log-driver`

56
ee/ucp/kubernetes/layer-7-routing.md
View File

@ -439,59 +439,3 @@ dockerdemo-ingress dockerdemo.app.docker.example.com 80 7d
Assuming you have already registered a DNS record for your application pointing to the external load-balancer fronting the `infra` nodes, you should be able to access your application using the URL.You can also scale the docker demo deployment to test how ingress correctly routes traffic to all the backend pods!
![dockerdemo.png](../images/ingress-deploy.png)
## Check your deployment
The `default-http-backend` provides a simple service that serves a 404 page
at `/` and serves 200 on the `/healthz` endpoint.
1. Navigate to the **Controllers** page and confirm that the
**default-http-backend** and **nginx-ingress-controller** objects are
scheduled.
> Scheduling latency
>
> It may take several seconds for the HTTP backend and the ingress controller's
> `Deployment` and `ReplicaSet` objects to be scheduled.
{: .important}
![](../images/deploy-ingress-controller-2.png){: .with-border}
2. When the workload is running, navigate to the **Load Balancers** page
and click the **ingress-nginx** service.
![](../images/deploy-ingress-controller-3.png){: .with-border}
3. In the details pane, click the first URL in the **Ports** section.
A new page opens, displaying `default backend - 404`.
## Check your deployment from the CLI
From the command line, confirm that the deployment is running by using
`curl` with the URL that's shown on the details pane of the **ingress-nginx**
service.
```bash
curl -I http://<ucp-ip>:<ingress port>/
```
This command returns the following result.
```
HTTP/1.1 404 Not Found
Server: nginx/1.13.8
```
Test the server's health ping service by appending `/healthz` to the URL.
```bash
curl -I http://<ucp-ip>:<ingress port>/healthz
```
This command returns the following result.
```
HTTP/1.1 200 OK
Server: nginx/1.13.8
```

4
get-started/part4.md
View File

@ -126,6 +126,8 @@ so they can connect to each other.
Now, create a couple of VMs using our node management tool,
`docker-machine`:
> **Note**: you need to run the following as administrator or else you don't have the permission to create hyperv VMs!
```shell
docker-machine create -d hyperv --hyperv-virtual-switch "myswitch" myvm1
docker-machine create -d hyperv --hyperv-virtual-switch "myswitch" myvm2
@ -143,6 +145,8 @@ You now have two VMs created, named `myvm1` and `myvm2`.
Use this command to list the machines and get their IP addresses.
> **Note**: you need to run the following as administrator or else you don't get any resonable output (only "UNKNOWN").
```shell
docker-machine ls
```