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 diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index a4eee82a4b..39227d93bf 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 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 [Download](https://download.docker.com/mac/edge/33772/Docker.dmg) diff --git a/docker-for-windows/edge-release-notes.md b/docker-for-windows/edge-release-notes.md index ec3e48ea45..07e42d1bec 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 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 [Download](https://download.docker.com/win/edge/33772/Docker%20Desktop%20Installer.exe) 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