beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #29561 from londoncalling/docs-glossary-d4mac-d4win

Browse source 
updates to glossary re: d4mac, d4win, toolbox per user request
(cherry picked from commit fb41283e49)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
Sebastiaan van Stijn 2016-12-21 02:16:28 +01:00 committed by Sebastiaan van Stijn
parent 114aa22e97
commit 199cd1e36e
No known key found for this signature in database
GPG key ID: 76698F39D527CE8C
1 changed files with 34 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
docs/reference/glossary.md
View file

@ -115,6 +115,27 @@ develop, ship, and run applications
- The docker daemon process running on the host which manages images and containers
## Docker for Mac
[Docker for Mac](https://docs.docker.com/docker-for-mac/) is an easy-to-install,
lightweight Docker development environment designed specifically for the Mac. A
native Mac application, Docker for Mac uses the macOS Hypervisor framework,
networking, and filesystem. It's the best solution if you want to build, debug,
test, package, and ship Dockerized applications on a Mac. Docker for Mac
supersedes [Docker Toolbox](#toolbox) as state-of-the-art Docker for macOS.
## Docker for Windows
[Docker for Windows](https://docs.docker.com/docker-for-windows/) is an
easy-to-install, lightweight Docker development environment designed
specifically for Windows systems. Docker for Windows uses Microsoft Hyper-V, and
runs as a native Windows app. It works with Windows Server 2016, and gives you
the ability to set up and run Windows containers as well as the standard Linux
containers (with an option to switch between the two). Docker for Windows is the
best solution if you want to build, debug, test, package, and ship Dockerized
applications on Windows machines. It supersedes [Docker Toolbox](#toolbox) as
state-of-the-art Docker on Windows.
## Docker Hub
The [Docker Hub](https://hub.docker.com/) is a centralized resource for working with
@ -286,14 +307,23 @@ containers.
## Toolbox
Docker Toolbox is the installer for Mac and Windows users.
[Docker Toolbox](https://docs.docker.com/toolbox/overview/) is a legacy
installer for Mac and Windows users. It uses Oracle VirtualBox for
virtualization.
For Macs running OS X El Capitan 10.11 and newer macOS releases, [Docker for
Mac](https://docs.docker.com/docker-for-mac/) is the better solution.
For Windows 10 systems that support Microsoft Hyper-V (Professional, Enterprise
and Education), [Docker for
Windows](https://docs.docker.com/docker-for-windows/) is the better solution.
## Union file system
Union file systems, or UnionFS, are file systems that operate by creating layers, making them
very lightweight and fast. Docker uses union file systems to provide the building
blocks for containers.
Union file systems, or UnionFS, are file systems that operate by creating
layers, making them very lightweight and fast. Docker uses union file systems to
provide the building blocks for containers.
## virtual machine