docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:docker/toolbox

This commit is contained in:
Jeffrey Morgan 2015-07-23 09:14:49 -07:00
parent 5f3135bc56 6c1535543e
commit 1de2d83b96
2 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
README.md
View File

@ -1,4 +1,4 @@
[![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://toolbox.docker.com) [![docker toolbox logo](https://cloud.githubusercontent.com/assets/251292/8687428/fd6ed9f0-2a44-11e5-9424-a3f1445e4845.png)](https://www.docker.com/toolbox)
The Docker Toolbox installs everything you need to get started with The Docker Toolbox installs everything you need to get started with
Docker on Mac OS X and Windows, including: Docker on Mac OS X and Windows, including:
@ -9,6 +9,17 @@ Docker on Mac OS X and Windows, including:
- Kitematic (Beta) - Kitematic (Beta)
- VirtualBox - VirtualBox
| | Mac | Windows | Linux (Help Wanted) |
|------------------------|--------|-------------|---------------------|
| Docker Client / Engine | Client | Client | Engine |
| Docker Machine | Yes | Yes | Yes |
| Docker Compose | Yes | Coming Soon | Yes |
| Docker Kitematic | Yes | Yes | Coming Soon |
| VirtualBox 5.0 | Yes | Yes | No |
## Installation and documentation ## Installation and documentation
Full documentation [is available Full documentation [is available

4
osx/mpkg/Resources/en.lproj/Localizable.strings
View File

@ -21,8 +21,8 @@
'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%'; 'choiceVBox_title' = 'Oracle VM VirtualBox %VBOX_VERSION%';
'choiceVBox_msg' = 'Installs the Oracle VM VirtualBox application into /Applications.'; 'choiceVBox_msg' = 'Installs the Oracle VM VirtualBox application into /Applications.';
'RUNNING_VMS_TLE' = "Running VirtualBox detected!"; 'RUNNING_VMS_TLE' = "Please Quit VirtualBox!";
'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please shutdown all running VirtualBox machines and exit VirtualBox. Then restart the Docker Toolbox installation."; 'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please quit VirtualBox, and then restart the Docker Toolbox installation.";
'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!"; 'UNSUPPORTED_HW_MACHINE_TLE' = "Unsupported hardware architecture detected!";
'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures."; 'UNSUPPORTED_HW_MACHINE_MSG' = "The installer has detected an unsupported architecture. VirtualBox only runs on the x86 and amd64 architectures.";