mirror of
https://github.com/docker/docs.git
synced 2026-11-05 00:14:17 +03:00
Merge pull request #1 from moxiegirl/install-text
Updating text of installer
This commit is contained in:
@@ -5,26 +5,21 @@
|
||||
<style>li {padding-bottom:1em;}</style>
|
||||
</head>
|
||||
<body style="font-family: Helvetica, Sans-Serif;">
|
||||
<p>
|
||||
<ul>
|
||||
<li><b>Quick-Start: </b>Run Docker Shell (located in Applications), which will open a terminal window. Then, start a test container with:<br /><code>docker run hello-world</code></li>
|
||||
</ul>
|
||||
<br />
|
||||
<br />
|
||||
<ul>
|
||||
<li>To save and share container images, automate workflows, and more sign-up for a free <a href="http://hub.docker.com/?utm_source=b2d&utm_medium=installer&utm_term=summary&utm_content=osx&utm_campaign=product">Docker Hub account</a>.</li>
|
||||
</ul>
|
||||
<br />
|
||||
<br />
|
||||
<ul>
|
||||
<li>You can upgrade your existing Docker dev VM without data loss by running: <br /><code>docker-machine upgrade dev</code></li>
|
||||
</ul>
|
||||
<br />
|
||||
<br />
|
||||
<ul>
|
||||
<li> The <code>docker</code>, <code>docker-machine</code>, and <code>docker-compose</code> binaries are in <code>/usr/local/bin</code> which you can access from your terminal. </br>
|
||||
For further information, please see the <a href="http://docs.docker.com/installation/mac">Docker OS X installation documentation</a>.</li>
|
||||
</ul>
|
||||
<h3>Quick-Start</h3>
|
||||
<ol>
|
||||
<li>Start Launchpad.</li>
|
||||
<li>In the Docker Toolbox folder, open the Docker CLI terminal window.</li>
|
||||
<li>At the command line, test your installation by entering: <br /><code>docker run hello-world</code></li>
|
||||
<li>Visit the <a href="http://docs.docker.com/installation/mac">Docker OS X installation</a> to learn more about your new installation.</li>
|
||||
</ol>
|
||||
<br>
|
||||
<h3>Upgrade your VM</h3>
|
||||
<p>
|
||||
To upgrade your existing Docker <code>dev</code> VM without data loss:<br/>
|
||||
<code>docker-machine upgrade dev</code>
|
||||
</p>
|
||||
<h3>Find images, share images, and more</h3>
|
||||
<p>To save and share container images, automate workflows, and more sign-up for a free <a href="http://hub.docker.com/?utm_source=b2d&utm_medium=installer&utm_term=summary&utm_content=osx&utm_campaign=product">Docker Hub account</a>.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
@@ -22,7 +22,7 @@
|
||||
'choiceVBox_msg' = 'Installs the Oracle VM VirtualBox application into /Applications.';
|
||||
|
||||
'RUNNING_VMS_TLE' = "Running VirtualBox detected!";
|
||||
'RUNNING_VMS_MSG' = "The installer has detected that VirtualBox is still running. Please shutdown all running VirtualBox machines and exit VirtualBox then restart the installation.";
|
||||
'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.";
|
||||
|
||||
'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.";
|
||||
|
||||
@@ -7,19 +7,25 @@
|
||||
<h1>Docker Toolbox for Mac OS X</h1>
|
||||
|
||||
<p>
|
||||
This installer will guide you through the steps to install
|
||||
This installer guides you through an installation of
|
||||
<b>Docker Toolbox for Mac OS X v%INSTALLER_VERSION%</b>.
|
||||
</p>
|
||||
<p>
|
||||
The Docker Toolbox installer includes the following:
|
||||
</p>
|
||||
|
||||
<p>
|
||||
The <code>docker</code>, <code>docker-machine</code>, and <code>docker-compose</code> binaries will be installed to <code>/usr/local/bin</code>, and can then be run from your Terminal.
|
||||
</br>
|
||||
For further information, please see the <a href="http://docs.docker.com/installation/mac">Docker OS X installation documentation</a>.
|
||||
<ul>
|
||||
<li>the Docker Engine <code>docker</code> binary
|
||||
<li>the Docker Machine <code>docker-machine</code> binary
|
||||
<li>the Docker Compose <code>docker-compose</code> binary
|
||||
<li>a shell preconfigured as a Docker command line environment
|
||||
</ul>
|
||||
<br/>
|
||||
<p>
|
||||
By default, these are installed in your <code>/usr/local/bin</code> directory.
|
||||
</p>
|
||||
|
||||
|
||||
<p>
|
||||
To continue, click Continue.
|
||||
To continue, click <b>Continue</b>.
|
||||
</p>
|
||||
</body>
|
||||
</html>
|
||||
|
||||
Reference in New Issue
Block a user