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 2018-12-11 12:23:20 -08:00
parent 4bdcbf8ae9 bb5c8e413a
commit 114baa4c13
6 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compose/compose-file/index.md
View File

@ -1727,6 +1727,7 @@ expressed in the short form.
created created
- `tmpfs`: configure additional tmpfs options - `tmpfs`: configure additional tmpfs options
- `size`: the size for the tmpfs mount in bytes - `size`: the size for the tmpfs mount in bytes
- `consistency`: the consistency requirements of the mount, one of `consistent` (host and container have identical view), `cached` (read cache, host view is authoritative) or `delegated` (read-write cache, container's view is authoritative)
```none ```none
version: "3.2" version: "3.2"

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

@ -1250,7 +1250,7 @@ events or unexpected unmounts.
* osxfs: fixed an issue causing `inotify` creation events to fail * osxfs: fixed an issue causing `inotify` creation events to fail
* osxfs: increased the `fs.inotify.max_user_watches` limit in Moby to 524288 * osxfs: increased the `fs.inotify.max_user_watches` limit in Moby to 524288
* The UI shows documentation link for sharing volumes * The UI shows documentation link for sharing volumes
* Clearer error message when running with outdated Virtualbox version * Clearer error message when running with outdated VirtualBox version
* Added link to sources for qemu-img * Added link to sources for qemu-img
**Known issues** **Known issues**
@ -1670,7 +1670,7 @@ lead to `Docker.app` not starting on reboot
- Fixed RAM amount error message - Fixed RAM amount error message
- Fixed wording of CPU error dialog - Fixed wording of CPU error dialog
- Removed status from Preferences - Removed status from Preferences
- Check for incompatible versions of Virtualbox - Check for incompatible versions of VirtualBox
### Beta 4 Release (2016-03-22 1.10.3-beta4) ### Beta 4 Release (2016-03-22 1.10.3-beta4)

2
docker-for-mac/faqs.md
View File

@ -334,7 +334,7 @@ HyperKit is a hypervisor built on top of the Hypervisor.framework in macOS. It r
dependencies. dependencies.
We use HyperKit to eliminate the need for other VM products, such as Oracle We use HyperKit to eliminate the need for other VM products, such as Oracle
Virtualbox or VMWare Fusion. VirtualBox or VMWare Fusion.
### What is the benefit of HyperKit? ### What is the benefit of HyperKit?

4
ee/ucp/kubernetes/ucp-secureoverlay.yml
View File

@ -120,7 +120,7 @@ spec:
serviceAccountName: ucp-secureoverlay-agent serviceAccountName: ucp-secureoverlay-agent
containers: containers:
- name: ucp-secureoverlay-agent - name: ucp-secureoverlay-agent
image: ucp-secureoverlay-agent:3.1.0 image: docker/ucp-secureoverlay-agent:3.1.0
securityContext: securityContext:
capabilities: capabilities:
add: ["NET_ADMIN"] add: ["NET_ADMIN"]
@ -162,4 +162,4 @@ spec:
restartPolicy: Always restartPolicy: Always
containers: containers:
- name: ucp-secureoverlay-mgr - name: ucp-secureoverlay-mgr
image: ucp-secureoverlay-mgr:3.1.0 image: docker/ucp-secureoverlay-mgr:3.1.0

2
machine/reference/create.md
View File

@ -156,7 +156,7 @@ $ docker-machine create -d virtualbox \
foobarmachine foobarmachine
``` ```
This creates a virtual machine running locally in Virtualbox which uses the This creates a virtual machine running locally in VirtualBox which uses the
`overlay` storage backend, has the key-value pairs `foo=bar` and `spam=eggs` as `overlay` storage backend, has the key-value pairs `foo=bar` and `spam=eggs` as
labels on the engine, and allows pushing / pulling from the insecure registry labels on the engine, and allows pushing / pulling from the insecure registry
located at `registry.myco.com`. You can verify much of this by inspecting the located at `registry.myco.com`. You can verify much of this by inspecting the

4
release-notes/docker-machine.md
View File

@ -523,7 +523,7 @@ toc_max: 2
- Update Boot2Docker cache in PreCreateCheck phase - Update Boot2Docker cache in PreCreateCheck phase
- OpenStack - OpenStack
- Filter floating IPs by tenant ID - Filter floating IPs by tenant ID
- Virtualbox - VirtualBox
- Reject duplicate hostonlyifs Name/IP with clear message - Reject duplicate hostonlyifs Name/IP with clear message
- Detect when hostonlyif can't be created. Point to known working version of VirtualBox - Detect when hostonlyif can't be created. Point to known working version of VirtualBox
- Don't create the VM if no hardware virtualization is available and add a flag to force create - Don't create the VM if no hardware virtualization is available and add a flag to force create
@ -581,7 +581,7 @@ Non-core driver plugins should still work as intended (in externally distributed
- Generic - Generic
- Support password protected ssh keys though ssh-agent - Support password protected ssh keys though ssh-agent
- Support DNS names - Support DNS names
- Virtualbox - VirtualBox
- Show a warning if virtualbox is too old - Show a warning if virtualbox is too old
- Recognize yet another Hardware Virtualization issue pattern - Recognize yet another Hardware Virtualization issue pattern
- Fix Hardware Virtualization on Linux/AMD - Fix Hardware Virtualization on Linux/AMD