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-05-09 11:39:40 -07:00
parent 36be44a763 f2093d4e2a
commit 4d3d196bb6
4 changed files with 17 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
compose/environment-variables.md
View File

@ -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

7
docker-for-mac/edge-release-notes.md
View File

@ -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)

7
docker-for-windows/edge-release-notes.md
View File

@ -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)

4
ee/ucp/ucp-architecture.md
View File

@ -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