From 3702d79a4f389980f18c037ae8dc28397d5426fa Mon Sep 17 00:00:00 2001 From: bensonarokiadoss Date: Mon, 10 Dec 2018 15:18:34 +0000 Subject: [PATCH 1/3] update mgr and agent image location to pull from dockerhub --- ee/ucp/kubernetes/ucp-secureoverlay.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ee/ucp/kubernetes/ucp-secureoverlay.yml b/ee/ucp/kubernetes/ucp-secureoverlay.yml index 429bd21304..c73eea3f40 100644 --- a/ee/ucp/kubernetes/ucp-secureoverlay.yml +++ b/ee/ucp/kubernetes/ucp-secureoverlay.yml @@ -120,7 +120,7 @@ spec: serviceAccountName: ucp-secureoverlay-agent containers: - name: ucp-secureoverlay-agent - image: ucp-secureoverlay-agent:3.1.0 + image: docker/ucp-secureoverlay-agent:3.1.0 securityContext: capabilities: add: ["NET_ADMIN"] @@ -162,4 +162,4 @@ spec: restartPolicy: Always containers: - name: ucp-secureoverlay-mgr - image: ucp-secureoverlay-mgr:3.1.0 + image: docker/ucp-secureoverlay-mgr:3.1.0 From 6dd9fa00e99949505f7e29236de6b6c5b0b39f2e Mon Sep 17 00:00:00 2001 From: Dima Tisnek Date: Tue, 11 Dec 2018 12:46:25 +0900 Subject: [PATCH 2/3] Document consistency flag in mounts --- compose/compose-file/index.md | 1 + 1 file changed, 1 insertion(+) diff --git a/compose/compose-file/index.md b/compose/compose-file/index.md index c34bd24b68..6789569276 100644 --- a/compose/compose-file/index.md +++ b/compose/compose-file/index.md @@ -1727,6 +1727,7 @@ expressed in the short form. created - `tmpfs`: configure additional tmpfs options - `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 version: "3.2" From 186dc9dc2befae2eedb745a0c25af8f6ec790866 Mon Sep 17 00:00:00 2001 From: JoeWrightss Date: Tue, 11 Dec 2018 22:34:42 +0800 Subject: [PATCH 3/3] Fix some typos Signed-off-by: JoeWrightss --- docker-for-mac/edge-release-notes.md | 4 ++-- docker-for-mac/faqs.md | 2 +- machine/reference/create.md | 2 +- release-notes/docker-machine.md | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/docker-for-mac/edge-release-notes.md b/docker-for-mac/edge-release-notes.md index fcf0ad830d..7d5f56ee83 100644 --- a/docker-for-mac/edge-release-notes.md +++ b/docker-for-mac/edge-release-notes.md @@ -1228,7 +1228,7 @@ events or unexpected unmounts. * osxfs: fixed an issue causing `inotify` creation events to fail * osxfs: increased the `fs.inotify.max_user_watches` limit in Moby to 524288 * 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 **Known issues** @@ -1648,7 +1648,7 @@ lead to `Docker.app` not starting on reboot - Fixed RAM amount error message - Fixed wording of CPU error dialog - 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) diff --git a/docker-for-mac/faqs.md b/docker-for-mac/faqs.md index cb8f94edcd..0ffb5a9a5d 100644 --- a/docker-for-mac/faqs.md +++ b/docker-for-mac/faqs.md @@ -334,7 +334,7 @@ HyperKit is a hypervisor built on top of the Hypervisor.framework in macOS. It r dependencies. 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? diff --git a/machine/reference/create.md b/machine/reference/create.md index c0155db49a..9cbba0d10b 100644 --- a/machine/reference/create.md +++ b/machine/reference/create.md @@ -156,7 +156,7 @@ $ docker-machine create -d virtualbox \ 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 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 diff --git a/release-notes/docker-machine.md b/release-notes/docker-machine.md index c6f65cdc0c..9ad0da9b09 100644 --- a/release-notes/docker-machine.md +++ b/release-notes/docker-machine.md @@ -523,7 +523,7 @@ toc_max: 2 - Update Boot2Docker cache in PreCreateCheck phase - OpenStack - Filter floating IPs by tenant ID -- Virtualbox +- VirtualBox - Reject duplicate hostonlyifs Name/IP with clear message - 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 @@ -581,7 +581,7 @@ Non-core driver plugins should still work as intended (in externally distributed - Generic - Support password protected ssh keys though ssh-agent - Support DNS names -- Virtualbox +- VirtualBox - Show a warning if virtualbox is too old - Recognize yet another Hardware Virtualization issue pattern - Fix Hardware Virtualization on Linux/AMD