Skip to content

Commit e4a2991

Browse files
author
Misty Stanley-Jones
authored
Merge pull request #146 from mstanleyjones/faq_rhel_version
Update the FAQ for RHEL and Windows
2 parents d24399b + e442a21 commit e4a2991

1 file changed

Lines changed: 21 additions & 17 deletions

File tree

engine/faq.md

Lines changed: 21 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -32,16 +32,20 @@ https://github.com/docker/docker/blob/master/LICENSE)
3232

3333
### Does Docker run on macOS or Windows?
3434

35-
Docker Engine currently runs only on Linux, but you can use VirtualBox to run
36-
Engine in a virtual machine on your box, and get the best of both worlds. Check
37-
out the [*macOS*](installation/mac.md) and [*Microsoft
38-
Windows*](installation/windows.md) installation guides. The small Linux
39-
distribution boot2docker can be set up using the Docker Machine tool to be run
40-
inside virtual machines on these two operating systems.
35+
The Docker Engine client runs natively on Linux, macOS, and Windows. By default, these
36+
clients connect to a local Docker daemon running in a virtual environment managed
37+
by Docker, which provides the required features to run Linux-based containers within
38+
OS X or Windows, or Windows-based containers on Windows.
4139

42-
>**Note:** if you are using a remote Docker Engine daemon on a VM through Docker
43-
>Machine, then _do not_ type the `sudo` before the `docker` commands shown in
44-
>the documentation's examples.
40+
If your version of macOS or Windows does not include the required virtualization
41+
technology, you can use Docker Machine to work around these limitations.
42+
43+
You can run Windows-based **containers** on Windows Server 2016 and
44+
Windows 10. Windows-based containers require a Windows kernel to run, in the same
45+
way that Linux-based containers require a Linux kernel to run. You can even run
46+
Windows-based containers on a Windows virtual machine running on an macOS or Linux
47+
host. Docker Machine is not necessary if you run macOS 10.10.3 Yosemite, Windows
48+
Server 2016, or Windows 10.
4549

4650
### How do containers compare to virtual machines?
4751

@@ -156,14 +160,14 @@ the container will continue to as well. You can see a more substantial example
156160

157161
Linux:
158162

159-
- Ubuntu 12.04, 13.04 et al
160-
- Fedora 19/20+
161-
- RHEL 6.5+
162-
- CentOS 6+
163-
- Gentoo
164-
- ArchLinux
165-
- openSUSE 12.3+
166-
- CRUX 3.0+
163+
- Any distribution running version 3.10+ of the Linux kernel
164+
- Specific instructions are available for most Linux distributions, including
165+
[RHEL](installation/linux/rhel.md), [Ubuntu](installation/linux/ubuntulinux.md),
166+
[SuSE](installation/linux/suse.md), and many others.
167+
168+
Microsoft Windows:
169+
- Windows Server 2016
170+
- Windows 10
167171

168172
Cloud:
169173

0 commit comments

Comments
 (0)