From 330e930faa84a0b3ffcdf09ff4b04dce6f670043 Mon Sep 17 00:00:00 2001 From: Ulrich VACHON Date: Thu, 9 May 2019 15:04:50 +0200 Subject: [PATCH 1/6] DESKTOP-1122 Docker Desktop for Win 2.0.4.1 Signed-off-by: Ulrich VACHON --- docker-for-windows/edge-release-notes.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index ec3e48ea45..cc391996c7 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/docker-for-windows/edge-release-notes.md @@ -18,6 +18,13 @@ for Windows](install.md#download-docker-for-windows). ## Edge Releases of 2019 +### Docker Community Edition 2.0.4.1 2019-05-07 + +[Download](https://download.docker.com/win/edge/34207/Docker%20Desktop%20Installer.exe) + +* Bug fixes and minor changes + - Upgrade qemu from 2.8.0 to 3.1.0 to fix Arm emulation. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) + ### Docker Community Edition 2.0.4.0 2019-04-30 [Download](https://download.docker.com/win/edge/33772/Docker%20Desktop%20Installer.exe) From 2da93298e16d9becf31cdbdcbcb377d9e7746ef6 Mon Sep 17 00:00:00 2001 From: Ulrich VACHON Date: Thu, 9 May 2019 15:12:21 +0200 Subject: [PATCH 2/6] DESKTOP-1122 Docker Desktop for Mac 2.0.4.1 Signed-off-by: Ulrich VACHON --- docker-for-mac/edge-release-notes.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index a4eee82a4b..d4e2b9dd7f 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -18,6 +18,13 @@ for Mac](install.md#download-docker-for-mac). ## Edge Releases of 2019 +### Docker Community Edition 2.0.4.1 2019-05-07 + +[Download](https://download.docker.com/mac/edge/34207/Docker.dmg) + +* Bug fixes and minor changes + - Upgrade qemu from 2.8.0 to 3.1.0 to fix Arm emulation. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) + ### Docker Community Edition 2.0.4.0 2019-04-30 [Download](https://download.docker.com/mac/edge/33772/Docker.dmg) From d16e2214868195e068eddc580e453fc472cfbe80 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Thu, 9 May 2019 15:25:31 +0100 Subject: [PATCH 3/6] Update edge-release-notes.md --- docker-for-windows/edge-release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index cc391996c7..07e42d1bec 100644 --- a/docker-for-windows/edge-release-notes.md +++ b/docker-for-windows/edge-release-notes.md @@ -23,7 +23,7 @@ for Windows](install.md#download-docker-for-windows). [Download](https://download.docker.com/win/edge/34207/Docker%20Desktop%20Installer.exe) * Bug fixes and minor changes - - Upgrade qemu from 2.8.0 to 3.1.0 to fix Arm emulation. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) + - Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) ### Docker Community Edition 2.0.4.0 2019-04-30 From ead62aaf3ba032d483cbb0ec2b61636b2ae58a43 Mon Sep 17 00:00:00 2001 From: Usha Mandya <47779042+usha-mandya@users.noreply.github.com> Date: Thu, 9 May 2019 15:44:21 +0100 Subject: [PATCH 4/6] Update edge-release-notes.md --- docker-for-mac/edge-release-notes.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index d4e2b9dd7f..39227d93bf 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -23,7 +23,7 @@ for Mac](install.md#download-docker-for-mac). [Download](https://download.docker.com/mac/edge/34207/Docker.dmg) * Bug fixes and minor changes - - Upgrade qemu from 2.8.0 to 3.1.0 to fix Arm emulation. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) + - Upgrade QEMU from 2.8.0 to 3.1.0 to fix an emulation issue when building and running Java applications on Arm64 devices. [docker/for-mac#3646](https://github.com/docker/for-mac/issues/3646) ### Docker Community Edition 2.0.4.0 2019-04-30 From 89b428019db29f239d9f83191c5b99a7c074a312 Mon Sep 17 00:00:00 2001 From: Darwin Traver Date: Thu, 9 May 2019 14:31:35 -0400 Subject: [PATCH 5/6] Internal UCP component version updates (#8783) --- ee/ucp/ucp-architecture.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/ucp/ucp-architecture.md b/ee/ucp/ucp-architecture.md index 1821896523..0cd2b314a4 100644 --- a/ee/ucp/ucp-architecture.md +++ b/ee/ucp/ucp-architecture.md @@ -68,8 +68,8 @@ on a node depend on whether the node is a manager or a worker. Internally, UCP uses the following components: -* Calico v3.5 -* Kubernetes v1.11.5 +* Calico v3.5.3 +* Kubernetes v1.11.9 ### UCP components in manager nodes From f2093d4e2a5f950d1fd8e6dc61441a1d90cecdb4 Mon Sep 17 00:00:00 2001 From: Daniel Peukert Date: Thu, 9 May 2019 20:35:31 +0200 Subject: [PATCH 6/6] Fixed env_file anchor in environment-variables.md (#8764) --- compose/environment-variables.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/compose/environment-variables.md b/compose/environment-variables.md index 42680cce17..662eb23060 100644 --- a/compose/environment-variables.md +++ b/compose/environment-variables.md @@ -53,7 +53,7 @@ the same variable in the shell in which Compose is run. ## The “env_file” configuration option You can pass multiple environment variables from an external file through to -a service's containers with the ['env_file' option](compose-file.md#envfile), +a service's containers with the ['env_file' option](compose-file.md#env_file), just like with `docker run --env-file=FILE ...`: ```yaml