Skip to content

Commit

Permalink
Clarify Windows/Linux containers FAQs, add d4mac, d4win installs to T…
Browse files Browse the repository at this point in the history
…OC (docker#4283)

* add d4mac, d4win installs to TOC, clarified FAQs on Windows install

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added nosync to Mac and Windows installs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
  • Loading branch information
londoncalling authored Aug 18, 2017
1 parent fe90c11 commit dbe6e11
Show file tree
Hide file tree
Showing 3 changed files with 27 additions and 12 deletions.
6 changes: 6 additions & 0 deletions _data/toc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -2586,6 +2586,9 @@ manuals:
section:
- path: /docker-for-mac/
title: Getting started
- path: /docker-for-mac/install/
title: Install Docker for Mac
nosync: true
- path: /docker-for-mac/docker-toolbox/
title: Docker for Mac vs. Docker Toolbox
- path: /docker-for-mac/multi-arch/
Expand All @@ -2608,6 +2611,9 @@ manuals:
section:
- path: /docker-for-windows/
title: Getting started
- path: /docker-for-windows/install/
title: Install Docker for Windows
nosync: true
- path: /docker-for-windows/troubleshoot/
title: Logs and troubleshooting
- path: /docker-for-windows/faqs/
Expand Down
2 changes: 1 addition & 1 deletion docker-for-windows/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -599,7 +599,7 @@ Linux VM.

You can select which daemon (Linux or Windows) the Docker
CLI talks to. Select **Switch to Windows containers** to toggle to Windows
containers. Select **Switch to Linux containers**.
containers. Select **Switch to Linux containers** to toggle back to the default, Linux containers.

![Windows-Linux container types switch](images/config-popup-win-linux-switch.png)

Expand Down
31 changes: 20 additions & 11 deletions engine/faq.md
Original file line number Diff line number Diff line change
Expand Up @@ -24,24 +24,33 @@ https://github.com/moby/moby/blob/master/LICENSE)

### Does Docker run on Linux, macOS, or Windows?

The Docker Engine client runs natively on Linux, macOS, and Windows. By default, these
clients connect to a local Docker daemon running in a virtual environment managed
by Docker, which provides the required features to run Linux-based containers within
OS X or Windows, or Windows-based containers on Windows.
The Docker Engine client runs natively on Linux, macOS, and Windows. By default,
these clients connect to a local Docker daemon running in a virtual environment
managed by Docker, which provides the required features to run Linux-based
containers within OS X or Windows, and Windows-based containers on Windows.

If your version of macOS or Windows does not include the required virtualization
technology, you can use Docker Machine to work around these limitations.

You can run Windows-based **containers** on Windows Server 2016 and
Windows 10. Windows-based containers require a Windows kernel to run, in the same
way that Linux-based containers require a Linux kernel to run. You can even run
Windows-based containers on a Windows virtual machine running on an macOS or Linux
host. Docker Machine is not necessary if you run macOS 10.10.3 Yosemite, Windows
Server 2016, or Windows 10.
You can run Windows-based **containers** on Windows Server 2016 and Windows 10.
Windows-based containers require a Windows kernel to run, in the same way that
Linux-based containers require a Linux kernel to run. You can even run
Windows-based containers on a Windows virtual machine running on an macOS or
Linux host. Docker Machine is not necessary if you run macOS 10.10.3 Yosemite,
Windows Server 2016, or Windows 10.

To learn more about Docker on Windows platforms, see the all the topics in
[Install Docker for Windows](/docker-for-windows/install.md) and
[Install Docker Enterprise Edition for Windows Server 2016](/engine/installation/windows/docker-ee.md).

### How do containers compare to virtual machines?

Containers and virtual machines (VMs) are complementary. VMs excel at providing extreme isolation (for example with hostile tenant applications where you need the ultimate break out prevention). Containers operate at the process level, which makes them very lightweight and perfect as a unit of software delivery. While VMs take minutes to boot, containers can often be started in less than a second.
Containers and virtual machines (VMs) are complementary. VMs excel at providing
extreme isolation (for example with hostile tenant applications where you need
the ultimate break out prevention). Containers operate at the process level,
which makes them very lightweight and perfect as a unit of software delivery.
While VMs take minutes to boot, containers can often be started in less than a
second.

### What does Docker technology add to just plain LXC?

Expand Down

0 comments on commit dbe6e11

Please sign in to comment.