From 995c7933b32a835d27a482726f28abc4640179b3 Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Thu, 20 Sep 2018 13:17:58 -0400 Subject: [PATCH 1/2] Update Docker containerization docs The docs indicate that most systems must use a VM for containerization. This is no longer the case as Docker For Mac now uses HyperKit. See https://docs.docker.com/v17.12/docker-for-mac/docker-toolbox/ --- website/source/intro/vs/docker.html.md | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/website/source/intro/vs/docker.html.md b/website/source/intro/vs/docker.html.md index f6fe4c114..8a8ab1f7b 100644 --- a/website/source/intro/vs/docker.html.md +++ b/website/source/intro/vs/docker.html.md @@ -14,9 +14,10 @@ workflow across multiple operating systems. Docker is a container management that can consistently run software as long as a containerization system exists. Containers are generally more lightweight than virtual machines, so starting -and stopping containers is extremely fast. Most common development machines -don't have a containerization system built-in, and Docker uses a virtual machine -with Linux installed to provide that. +and stopping containers is extremely fast. Docker uses the native +containerization functionality on macOS and Linux, while it must start a Linux +VM for compatibility with Windows. + Currently, Docker lacks support for certain operating systems (such as BSD). If your target deployment is one of these operating systems, From 4a0628afbdf50b0a7f1bff1c2e29654d1aea0845 Mon Sep 17 00:00:00 2001 From: Zachary Wasserman Date: Thu, 20 Sep 2018 17:11:56 -0400 Subject: [PATCH 2/2] same for mac, linux and windows --- website/source/intro/vs/docker.html.md | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/website/source/intro/vs/docker.html.md b/website/source/intro/vs/docker.html.md index 8a8ab1f7b..457fa6aa0 100644 --- a/website/source/intro/vs/docker.html.md +++ b/website/source/intro/vs/docker.html.md @@ -15,8 +15,7 @@ that can consistently run software as long as a containerization system exists. Containers are generally more lightweight than virtual machines, so starting and stopping containers is extremely fast. Docker uses the native -containerization functionality on macOS and Linux, while it must start a Linux -VM for compatibility with Windows. +containerization functionality on macOS, Linux, and Windows. Currently, Docker lacks support for certain operating systems (such as