centersl/docker-docs
1
0
Fork 0
mirror of https://github.com/docker/docs.git synced 2026-04-05 18:58:55 +07:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'upstream/master' into 2019-08-patch-release-notes

Browse Source
This commit is contained in:
Traci Morrison
2019-08-16 10:38:39 -04:00
parent d99e0d3b05 1f805b8de0
commit eebb576dc2
2 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
ee/ucp/admin/install/cloudproviders/install-on-azure.md
View File

@@ -69,10 +69,11 @@ objects are being deployed.
### Azure Configuration File
For Docker UCP to integrate with Microsoft Azure,each UCP node in your cluster
needs an Azure configuration file, `azure.json`. Place the file within
`/etc/kubernetes`. Since the config file is owned by `root`, set its permissions
to `0644` to ensure the container user has read access.
For UCP to integrate with Microsoft Azure, all Linux UCP Manager and Linux UCP
Worker nodes in your cluster need an identical Azure configuration file,
`azure.json`. Place this file within `/etc/kubernetes` on each host. Since the
configution file is owned by `root`, set its permissions to `0644` to ensure
the container user has read access.
The following is an example template for `azure.json`. Replace `***` with real values, and leave the other
parameters as is.

2
engine/release-notes.md
View File

@@ -169,7 +169,7 @@ in compose-files service configs. [docker/cli#1617](https://github.com/docker/cl
* Added pids-limit support in docker update. [moby/moby#32519](https://github.com/moby/moby/pull/32519)
* Added support for exact list of capabilities. [moby/moby#38380](https://github.com/moby/moby/pull/38380)
* daemon: Now use 'private' ipc mode by default. [moby/moby#35621](https://github.com/moby/moby/pull/35621)
* daemon: switched to semaphore-gated WaitGroup for startup tasks. moby/moby#38301](https://github.com/moby/moby/pull/38301)
* daemon: switched to semaphore-gated WaitGroup for startup tasks. [moby/moby#38301](https://github.com/moby/moby/pull/38301)
* Now use `idtools.LookupGroup` instead of parsing `/etc/group` file for docker.sock ownership to
fix: `api.go doesn't respect nsswitch.conf`. [moby/moby#38126](https://github.com/moby/moby/pull/38126)
* cli: fixed images filter when using multi reference filter. [moby/moby#38171](https://github.com/moby/moby/pull/38171)