updated 'where to go next' x-refs to tutorials

updates for new advanced settings UI w/disk image labels d4mac

reformatted what the install includes lists in intros

copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
This commit is contained in:
Victoria Bialas 2017-01-26 15:34:04 -08:00
parent 3f06af3e6e
commit 89a827590e
5 changed files with 81 additions and 28 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 35 KiB

After

Width:  |  Height:  |  Size: 69 KiB

View File

@ -71,36 +71,38 @@ channels, see the [FAQs](/docker-for-mac/faqs.md#stable-and-beta-channels).
[Docker for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the [Docker for Mac vs. Docker Toolbox](docker-toolbox.md) to understand the
impact of this installation on your existing setup, how to set your environment impact of this installation on your existing setup, how to set your environment
for Docker for Mac, and how the two products can coexist. for Docker for Mac, and how the two products can coexist.
<p />
* **Relationship to Docker Machine**: Installing Docker for Mac does not affect * **Relationship to Docker Machine**: Installing Docker for Mac does not affect
machines you created with Docker Machine. You'll get the option to copy machines you created with Docker Machine. You'll get the option to copy
containers and images from your local `default` machine (if one exists) to the containers and images from your local `default` machine (if one exists) to the
new Docker for Mac [HyperKit](https://github.com/docker/HyperKit/)"> VM. When new Docker for Mac [HyperKit](https://github.com/docker/HyperKit/)" VM. When
you are running Docker for Mac, you do not need Docker Machine nodes running you are running Docker for Mac, you do not need Docker Machine nodes running
at all locally (or anywhere else). With Docker for Mac, you have a new, native at all locally (or anywhere else). With Docker for Mac, you have a new, native
virtualization system running (HyperKit) which takes the place of the virtualization system running (HyperKit) which takes the place of the
VirtualBox system. To learn more, see VirtualBox system. To learn more, see
[Docker for Mac vs. Docker Toolbox](docker-toolbox.md). [Docker for Mac vs. Docker Toolbox](docker-toolbox.md).
<p />
* **System Requirements**: Docker for Mac will launch only if all of these * **System Requirements**: Docker for Mac will launch only if all of these
requirements are met. requirements are met.
- Mac must be a 2010 or newer model, with Intel's hardware support for memory <p />
- Mac must be a 2010 or newer model, with Intel's hardware support for memory
management unit (MMU) virtualization; i.e., Extended Page Tables (EPT) and management unit (MMU) virtualization; i.e., Extended Page Tables (EPT) and
Unrestricted Mode. Unrestricted Mode.
<p />
- OS X El Capitan 10.11 and newer macOS releases are supported. At a minimum, - OS X El Capitan 10.11 and newer macOS releases are supported. At a minimum,
Docker for Mac requires macOS Yosemite 10.10.3 or newer, with the caveat Docker for Mac requires macOS Yosemite 10.10.3 or newer, with the caveat
that going forward 10.10.x is a use-at-your-own risk proposition. that going forward 10.10.x is a use-at-your-own risk proposition.
<p />
- Starting with Docker for Mac stable release 1.13 (upcoming), and concurrent - Starting with Docker for Mac stable release 1.13 (upcoming), and concurrent
Beta releases, we will no longer address issues specific to OS X Yosemite Beta releases, we will no longer address issues specific to OS X Yosemite
10.10. In future releases, Docker for Mac could stop working on OS X Yosemite 10.10. In future releases, Docker for Mac could stop working on OS X Yosemite
10.10 due to the deprecated status of this OS X version. We recommend 10.10 due to the deprecated status of this OS X version. We recommend
upgrading to the latest version of macOS. upgrading to the latest version of macOS.
<p />
- At least 4GB of RAM - At least 4GB of RAM
<p />
- VirtualBox prior to version 4.3.30 must NOT be installed (it is incompatible - VirtualBox prior to version 4.3.30 must NOT be installed (it is incompatible
with Docker for Mac) with Docker for Mac)
@ -213,8 +215,7 @@ docker-machine version 0.9.0-rc2, build 7b19591
`docker rm -f webserver`. This will remove the container, but not the `docker rm -f webserver`. This will remove the container, but not the
`nginx` image. You can list local images with `docker images`. You might `nginx` image. You can list local images with `docker images`. You might
want to keep some images around so that you don't have to pull them again want to keep some images around so that you don't have to pull them again
from Docker Hub. To remove an image you no longer need, use `docker rmi` from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
followed by an image ID or image name. For example, `docker rmi nginx`.
**Want more example applications?** - For more example walkthroughs that include **Want more example applications?** - For more example walkthroughs that include
setting up services and databases in Docker Compose, see setting up services and databases in Docker Compose, see
@ -306,6 +307,17 @@ lower (to `1`) if you want Docker for Mac to use less memory.
You can specify the **storage location** of the Linux volume; i.e., where You can specify the **storage location** of the Linux volume; i.e., where
containers and images are stored. containers and images are stored.
##### Disk image location (Beta)
Starting with Beta 39, the labels on this dialog were updated as follows.
* **Storage location** is renamed to **Disk image location**
* **Change location** button is renamed to **move disk image**
![Beta Advanced settings](images/settings-advanced-beta.png)
### HTTP proxy settings ### HTTP proxy settings
@ -456,13 +468,13 @@ options at the bottom of each docs page.
## Where to go next ## Where to go next
* Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial. * Try out the tutorials and sample app walkthroughs at [Learn Docker](/learn.md), including:
* Follow up by working through the voting app example to learn how to * Learn Docker basics in [Getting Started with Docker](/engine/getstarted/index.md)
[define and deploy a Docker stack](/engine/getstarted-voting-app/index.md) to a
[swarm](/engine/swarm/index.md). This example shows how to deploy multiple * Learn how to [define and deploy a Docker stack to a swarm](/engine/getstarted-voting-app/index.md)
containers as services and use new (deploy multiple containers as services and use new
[Compose Version 3](/compose/compose-file.md#version-3) features. Compose Version 3 features)
* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example
walkthroughs and source code. walkthroughs and source code.

View File

@ -269,6 +269,30 @@ events or unexpected unmounts.
## Beta Release Notes ## Beta Release Notes
### Beta 39 Release Notes (2017-01-26 1.13.0-beta39)
**Upgrades**
- Linux kernel 4.9.5
**New**
- More options when moving disk image
- Filesharing and daemon table empty fields are editable
- DNS forwarder ignores responses from malfunctioning servers ([docker/for-mac#1025](https://github.com/docker/for-mac/issues/1025))
- DNS forwarder send all queries in parallel, process results in order
- DNS forwarder includes servers with zones in general searches ([docker/for-mac#997](https://github.com/docker/for-mac/issues/997))
- Parses aliases from /etc/hosts ([docker/for-mac#983](https://github.com/docker/for-mac/issues/983))
- Can resolve DNS requests via servers listed in the /etc/resolver directory on the host
**Bug fixes and minor improvements**
- Fix bug where update window hides when app not focused
- Limit vCPUs to 16 ([docker/for-mac#1144](https://github.com/docker/for-mac/issues/1144))
- Fix for swap not being mounted
- Fix aufs xattr delete issue ([docker/docker#30245](https://github.com/docker/docker/issues/30245))
### Beta 38 Release Notes (2017-01-20 1.13.0-beta38) ### Beta 38 Release Notes (2017-01-20 1.13.0-beta38)
**Upgrades** **Upgrades**

View File

@ -334,8 +334,7 @@ The next few steps take you through some examples. These are just suggestions fo
`docker rm -f webserver`. This will remove the container, but not the `docker rm -f webserver`. This will remove the container, but not the
`nginx` image. You can list local images with `docker images`. You might `nginx` image. You can list local images with `docker images`. You might
want to keep some images around so that you don't have to pull them again want to keep some images around so that you don't have to pull them again
from Docker Hub. To remove an image you no longer need, use `docker rmi from Docker Hub. To remove an image you no longer need, use `docker rmi` followed by an image ID or image name. For example, `docker rmi nginx`.
<imageID>|<imageName>`. For example, `docker rmi nginx`.
**Want more example applications?** - For more example walkthroughs that include **Want more example applications?** - For more example walkthroughs that include
setting up services and databases with Docker Compose, see setting up services and databases with Docker Compose, see
@ -760,19 +759,18 @@ If you want to go back to using Docker Toolbox, you have to disable the Hyper-V
## Where to go next ## Where to go next
* Try out the [Getting Started with Docker](/engine/getstarted/index.md) tutorial. * Try out the tutorials and sample app walkthroughs at [Learn Docker](/learn.md), including:
* Follow up by working through the voting app example to learn how to * Learn Docker basics in [Getting Started with Docker](/engine/getstarted/index.md)
[define and deploy a Docker stack](/engine/getstarted-voting-app/index.md) to a
[swarm](/engine/swarm/index.md). This example shows how to deploy multiple
containers as services and use new
[Compose Version 3](/compose/compose-file.md#version-3) features.
* Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example * Learn how to [define and deploy a Docker stack to a swarm](/engine/getstarted-voting-app/index.md)
walkthroughs and source code. (deploy multiple containers as services and use new
Compose Version 3 features)
* For a summary of Docker command line interface (CLI) commands, see the * Dig in deeper with [Docker Labs](https://github.com/docker/labs/) example walkthroughs and source code.
[Docker CLI Reference Guide](/engine/reference/commandline/docker.md).
* For a summary of Docker command line interface (CLI) commands,
see the [Docker CLI Reference Guide](/engine/reference/commandline/docker.md).
* Check out the blog post * Check out the blog post
[Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/). [Introducing Docker 1.13.0](https://blog.docker.com/2017/01/whats-new-in-docker-1-13/).

View File

@ -258,6 +258,25 @@ We did not distribute a 1.12.4 stable release
## Beta Release Notes ## Beta Release Notes
### Beta 39 Release Notes (2017-01-26 1.13.0-beta39)
**Upgrades**
- Linux kernel 4.9.5
**New**
- DNS forwarder ignores responses from malfunctioning servers
- DNS forwarder send all queries in parallel, process results in order
- DNS forwarder includes servers with zones in general searches
- Significantly increased single-stream TCP throughput
**Bug fixes and minor improvements**
- Fix some timeout issues in port forwarding
- Fix for swap not being mounted ([docker/for-win#403](https://github.com/docker/for-win/issues/403))
- Fix aufs xattr delete issue ([docker/docker#30245](https://github.com/docker/docker/issues/30245))
### Beta 38 Release Notes (2017-01-20 1.13.0-beta38) ### Beta 38 Release Notes (2017-01-20 1.13.0-beta38)
**Upgrades** **Upgrades**