From 1ef9a7e4d5b3c5598484db268daf2d17ca5102a8 Mon Sep 17 00:00:00 2001 From: Topher Cyll Date: Sat, 9 Feb 2019 13:25:41 -0500 Subject: [PATCH 1/7] Add an example json-file log line to the documentation. --- config/containers/logging/json-file.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/config/containers/logging/json-file.md b/config/containers/logging/json-file.md index 6e397885f6..913f08d305 100644 --- a/config/containers/logging/json-file.md +++ b/config/containers/logging/json-file.md @@ -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` From aaa85c6100586f4e6951dc37bf0c2ed57a8101b7 Mon Sep 17 00:00:00 2001 From: mmoser18 <17732576+mmoser18@users.noreply.github.com> Date: Tue, 19 Feb 2019 21:50:00 +0100 Subject: [PATCH 2/7] Update part4.md Some commands need to be run as Administrator on Windows or else they will fail or produce empty output. --- get-started/part4.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/get-started/part4.md b/get-started/part4.md index fbbea8ac25..58c9a48cc7 100644 --- a/get-started/part4.md +++ b/get-started/part4.md @@ -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 ``` From aac6d8ed53b29b2f226bf4e1fee89926359a9711 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Sun, 24 Feb 2019 15:16:55 -0500 Subject: [PATCH 3/7] Update release-notes.md --- docker-for-aws/release-notes.md | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md index 2ebd3dfb14..ef64649a4f 100644 --- a/docker-for-aws/release-notes.md +++ b/docker-for-aws/release-notes.md @@ -29,10 +29,15 @@ title: Docker for AWS release notes ## Stable channel -### 18.06.1 CE - {{aws_blue_latest}} +### 18.09.2 +Release date: 8/24/2018 + +- Docker Engine upgraded to [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2){: target="_blank" class="_"} + +### 18.06.1 CE + Release date: 8/24/2018 - Docker Engine upgraded to [Docker 18.06.1 CE](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce){: target="_blank" class="_"} From c3c915db1b7ea3436bcc58b090cf11568ecfb2a9 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Sun, 24 Feb 2019 15:24:36 -0500 Subject: [PATCH 4/7] Update release-notes.md --- docker-for-azure/release-notes.md | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/docker-for-azure/release-notes.md b/docker-for-azure/release-notes.md index a6dbe43590..a151dcea35 100644 --- a/docker-for-azure/release-notes.md +++ b/docker-for-azure/release-notes.md @@ -9,6 +9,11 @@ title: Docker for Azure Release Notes ## Enterprise Edition [Docker Enterprise Edition Lifecycle](https://success.docker.com/Policies/Maintenance_Lifecycle){: target="_blank"} +### 17.06.2-ee-19 EE +- Docker engine 17.06.2-ee-19 EE +- UCP 2.2.16 +- DTR 2.3.10 + ### 17.06 EE - Docker engine 17.06 EE @@ -24,10 +29,15 @@ title: Docker for Azure Release Notes ## Stable channel -### 18.06.1 CE - {{azure_blue_latest}} +### 18.09.2 +Release date: 2/24/2019 + + - Docker Engine upgraded to [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2){: target="_blank" class="_"} + +### 18.06.1 CE + Release date: 8/24/2018 - Docker Engine upgraded to [Docker 18.06.1 CE](https://github.com/docker/docker-ce/releases/tag/v18.06.1-ce){: target="_blank" class="_"} From 2e024a1ace991519a51ae0669bcd6290aaaa1768 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Sun, 24 Feb 2019 15:22:31 -0500 Subject: [PATCH 5/7] Update release-notes.md --- docker-for-aws/release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md index ef64649a4f..0063b913a9 100644 --- a/docker-for-aws/release-notes.md +++ b/docker-for-aws/release-notes.md @@ -32,7 +32,7 @@ title: Docker for AWS release notes {{aws_blue_latest}} ### 18.09.2 -Release date: 8/24/2018 +Release date: 2/24/2019 - Docker Engine upgraded to [Docker 18.09.2](https://github.com/docker/docker-ce/releases/tag/v18.09.2){: target="_blank" class="_"} From 3b3d8dc2942255960045194c19743b91eb8dc3f6 Mon Sep 17 00:00:00 2001 From: Joe Abbey Date: Sun, 24 Feb 2019 15:24:05 -0500 Subject: [PATCH 6/7] Update release-notes.md --- docker-for-aws/release-notes.md | 37 ++++++++++++++++----------------- 1 file changed, 18 insertions(+), 19 deletions(-) diff --git a/docker-for-aws/release-notes.md b/docker-for-aws/release-notes.md index 0063b913a9..a3249e7f4b 100644 --- a/docker-for-aws/release-notes.md +++ b/docker-for-aws/release-notes.md @@ -6,25 +6,6 @@ title: Docker for AWS release notes {% include d4a_buttons.md %} -## Enterprise Edition -[Docker Enterprise Edition Lifecycle](https://success.docker.com/Policies/Maintenance_Lifecycle){: target="_blank" class="_"} - -[Deploy Docker Enterprise Edition (EE) for AWS](https://hub.docker.com/editions/enterprise/docker-ee-aws?tab=description){: target="_blank" class="button outline-btn blank_"} - -### 17.06 EE - -- Docker engine 17.06 EE -- For Std/Adv external logging has been removed, as it is now handled by [UCP](https://docs.docker.com/datacenter/ucp/2.0/guides/configuration/configure-logs/){: target="_blank" class="_"} -- UCP 2.2.3 -- DTR 2.3.3 - -### 17.03 EE - -- Docker engine 17.03 EE -- UCP 2.1.5 -- DTR 2.2.7 - - > **Note** Starting with 18.02.0-CE EFS encryption option has been removed to prevent the [recreation of the EFS volume](https://docs.aws.amazon.com/AWSCloudFormation/latest/UserGuide/using-cfn-updating-stacks-update-behaviors.html){: target="_blank" class="_"}. @@ -144,3 +125,21 @@ Release date: 10/18/2017 ## Template archive If you are looking for templates from older releases, check out the [template archive](/docker-for-aws/archive.md). + +## Enterprise Edition +[Docker Enterprise Edition Lifecycle](https://success.docker.com/Policies/Maintenance_Lifecycle){: target="_blank" class="_"} + +[Deploy Docker Enterprise Edition (EE) for AWS](https://hub.docker.com/editions/enterprise/docker-ee-aws?tab=description){: target="_blank" class="button outline-btn blank_"} + +### 17.06 EE + +- Docker engine 17.06 EE +- For Std/Adv external logging has been removed, as it is now handled by [UCP](https://docs.docker.com/datacenter/ucp/2.0/guides/configuration/configure-logs/){: target="_blank" class="_"} +- UCP 2.2.3 +- DTR 2.3.3 + +### 17.03 EE + +- Docker engine 17.03 EE +- UCP 2.1.5 +- DTR 2.2.7 From d2b5d6cdbb20412de95fa5410c366d690dede1ae Mon Sep 17 00:00:00 2001 From: paigehargrave Date: Mon, 25 Feb 2019 18:32:44 -0500 Subject: [PATCH 7/7] Update layer-7-routing.md --- ee/ucp/kubernetes/layer-7-routing.md | 56 ---------------------------- 1 file changed, 56 deletions(-) diff --git a/ee/ucp/kubernetes/layer-7-routing.md b/ee/ucp/kubernetes/layer-7-routing.md index a57ef051d2..1622cfeaee 100644 --- a/ee/ucp/kubernetes/layer-7-routing.md +++ b/ee/ucp/kubernetes/layer-7-routing.md @@ -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://:/ -``` - -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://:/healthz -``` - -This command returns the following result. - -``` -HTTP/1.1 200 OK -Server: nginx/1.13.8 -```