-
-### Learn Docker basics
+Try our new multi-part walkthrough that goes from writing your first app,
+data storage, networking, and swarms, ending with your app running on
+production servers in the cloud. Total reading time is less than an hour!
-Get started learning Docker concepts, tools, and commands. The examples show you
-how to build, push, and pull Docker images, and run them as containers. This
-tutorial stops short of teaching you how to deploy applications.
+[Get started with Docker](/get-started/){: class="button outline-btn" style="margin-bottom:30px"}
-[Start the basic tutorial](/engine/getstarted/){: class="button outline-btn"}
-
+{% if site.edge == true %}
+{% capture ce-edge-section %}
-
-### Define and deploy apps in Swarm Mode
+## Docker CE Edge
-Learn how to relate containers to each other, define them as services, and
-configure an application stack ready to deploy at scale in a production
-environment. Highlights Compose Version 3 new features and swarm mode.
+The Docker CE Edge channel provides monthly releases which allow you to try
+new features of Docker and verify bug fixes quickly. Edge releases are only
+supported for one month, and a given Edge release will not receive any updates
+once a new edge release is available.
-[Start the application tutorial](/engine/getstarted-voting-app/){: class="button outline-btn"}
-
-
+
+This page lists features that are only available in Docker CE Edge releases.
+Where applicable, the API and CLI reference documentation has been updated to
+reflect these features, but **full documentation for a given feature may not be
+available until a Docker CE Stable release incorporates the feature**.
+
+### Docker CE Edge new features
+
+
+
+
+
+#### Docker CE Edge 17.04
+
+The following major features and changes are included in Docker CE Edge 17.04.
+Continue reading, or go straight to [API and CLI](#api-and-cli),
+[Daemon](#daemon), [Dockerfile](#dockerfile), [Services](#services), or
+[Stacks](#stacks).
+
+[Read the full release notes](https://github.com/docker/docker/releases/tag/v17.04.0-ce){: target="_blank" class="_" }
+
+##### API and CLI
+
+- Add `--device-cgroup-rule` flag to give containers access to devices that appear
+ after the container is started. {% include github-pr.md pr=22563 %}
+
+- Allow swarm nodes to join with `--availability=drain` to prevent them from
+ taking non-manager workloads. {% include github-pr.md pr=24993 %}
+
+- Add `publish` and `expose` filters to `docker ps`, so that containers can be
+ filtered by port or port range for TCP or UDP protocols {% include github-pr.md pr=27557 %}
+
+- Add `--no-trunc` and `--format` flags to the `docker service ls` command, and
+ as well as the ability to specify the default format for `docker service ls`
+ using the `ServicesFormat` option to the Docker CLI. Also add a
+ `docker stack services` command. {% include github-pr.md pr=28199 %}
+
+- Add ability to filter plugins by whether they are enabled or disabled in
+ `docker plugin ls` output. {% include github-pr.md pr=28627 %}
+
+- Add `mode` option to `--log-opts` flag for both `docker` and `dockerd`. If set
+ to `non-blocking`, and the log buffer fills up, log messages will be lost, but
+ the container will not block. The `max-buffer-size` option controls the
+ maximum size of the ring buffer. Defaults to `blocking`, which will cause the
+ container to block if messages cannot be logged. See
+ [Options for all drivers](/engine/admin/logging/overview.md#options-for-all-drivers).
+ {% include github-pr.md pr=28762 %}
+
+- It is no longer possible to inadvertently pull images on an architecture where
+ they will not run. {% include github-pr.md pr=29001 %}
+
+- It is now possible to create AWS log groups when using the AWS logging driver.
+ See [`awslogs-create-group`](engine/admin/logging/awslogs.md#awslogs-create-group).
+ {% include github-pr.md pr=29504 %}
+
+- Add the ability to filter `docker network ls` output by creation time, using
+ the `{% raw %}{{CreatedAt}}{% endraw %}` format specifier.
+ {% include github-pr.md pr=29900 %}
+
+- Named but untagged images are now removed if you run `docker image prune` if
+ `--dangling-only` is set to `true`. {% include github-pr.md pr=30330 %}
+
+- Add `--add-host` flag to `docker build`, which will add entries to the
+ `/etc/hosts` file of a container created from that image. The `/etc/hosts`
+ file is not saved within the image itself. {% include github-pr.md pr=30383 %}
+
+- Prevent `docker network ls` from pulling all the endpoints, to reduce
+ impact on the network. {% include github-pr.md pr=30673 %}
+
+- Windows-specific commands and options no longer show in command help text on
+ non-Windows clients. {% include github-pr.md pr=30780 %}
+
+- When you specify an IP address when running `docker network connect`, the
+ IP address is now checked for validity. {% include github-pr.md pr=30807 %}
+
+- Add the ability to customize bind-mount consistency to be more appropriate
+ for some platforms and workloads. Options are `consistent` (the default),
+ `cached`, or `delegated`. {% include github-pr.md pr=31047 %}
+
+##### Daemon
+
+- Docker Daemon logging settings no longer affect the `docker build` command.
+ {% include github-pr.md pr=29552 %}
+
+- Add a `registry-mirrors` configuration option for the Docker daemon, which
+ replaces the daemon's registry mirrors with a new set of registry mirrors.
+ {% include github-pr.md pr=29650 %}
+
+- Add the ability to specify the default shared memory size for the Docker
+ daemon, using the `--default-shm-size` or the `default-shm-size` key in
+ `daemon.json`. {% include github-pr.md pr=29692 %}
+
+- Add a `no-new-privileges` configuration option for the Docker daemon, which
+ prevents unprivileged containers from gaining new privileges.
+ {% include github-pr.md pr=29984 %}
+
+- If a Docker client communicates with an older daemon and attempts to perform
+ an operation not supported by the daemon, an error is printed, which shows
+ the API versions of both the client and daemon.
+ {% include github-pr.md pr=30187 %}
+
+- The Docker daemon no longer depends upon `sqlite`. This change means that it
+ is not possible to upgrade the Docker daemon from version 1.9 directly to the
+ latest version. It is recommended to upgrade from one major version to the
+ next, in sequence. {% include github-pr.md pr=30208 %}
+
+##### Dockerfile
+
+- Using the pattern `**/` in a Dockerfile now (correctly) behaves the same as
+ `**`. {% include github-pr.md pr=29043 %}
+
+- Time values less than 1 second are no longer allowed in health-check options
+ in the Dockerfile. {% include github-pr.md pr=31177 %}
+
+##### Services
+
+- When a service is updated with both `--secret-add` and `--secret-rm` in the
+ same operation, the order of operations is now changed so that the
+ `--secret-rm` always occurs first. {% include github-pr.md pr=29802 %}
+
+- Add the ability to create or update a service to be read-only using the
+ `--read-only` flag. {% include github-pr.md pr=30162 %}
+
+- Docker now updates swarm nodes if the swarm configuration is updated.
+ {% include github-pr.md pr=30259 %}
+
+- Add topology-aware placement preferences for Swarm services. This feature
+ allows services to be balanced over nodes based on a particular user-defined
+ property, such as which datacenter or rack they are located in.
+ See [Control service scale and placement](/engine/swarm/services.md#control-service-scale-and-placement).
+ {% include github-pr.md pr=30725 %}
+
+- Add the ability to customize the stop signal which will be sent to nodes, when
+ creating or updating a service. {% include github-pr.md pr=30754 %}
+
+- Add the ability to address a secret by name or prefix, as well as ID, when
+ updating it. {% include github-pr.md pr=30856 %}
+
+- Add the ability to roll back to a previous version of a service if an
+ updated service fails to deploy. Several flags are available at service
+ creation or update,to control the rollback action, failure threshold,
+ monitoring delay, rollback delay, and parallelism.
+ {% include github-pr.md pr=31108 %}
+
+- Add the ability to specify the stream when using the Docker service logs API.
+ {% include github-pr.md pr=31313 %}
+
+- Add `--tail` and `--since` flags to `docker service logs` command, to filter
+ the logs by time or to show the tail of the logs and show new content as it
+ is logged. {% include github-pr.md pr=31500 %}
+
+- Add a `--verbose` flag to the `docker inspect` command. For swarm networks,
+ this flag shows all nodes and services attached to the network.
+ {% include github-pr.md pr=31710 %}
+
+##### Stacks
+
+- Compose file version 3.2 is now supported. This includes support for different
+ types of endpoints and expands the options you can use when specifying mounts.
+ {% include github-pr.md pr=31795 %}
+
+
+
+
+
diff --git a/learn.md b/learn.md
deleted file mode 100644
index ac24fa2eaf..0000000000
--- a/learn.md
+++ /dev/null
@@ -1,35 +0,0 @@
----
-title: Learn Docker
-redirect_from:
-- /engine/quickstart/
----
-
-In this section, you can explore various ways to get up to speed on
-Docker workflows.
-
-
-
-|
-## Learn the basics of Docker
-
-The basic tutorial introduces Docker concepts, tools, and commands. The examples show you how to build, push,
-and pull Docker images, and run them as containers. This
-tutorial stops short of teaching you how to deploy applications.
- |
-
-## Define and deploy applications
-
-The define-and-deploy tutorial shows how to relate
-containers to each other and define them as services in an application that is ready to deploy at scale in a
-production environment. Highlights Compose Version 3 new features and swarm mode.
- |
-
-
-|
-[Start the basic tutorial](/engine/getstarted/){: class="button primary-btn"}
- |
-
-[Start the application tutorial](/engine/getstarted-voting-app/){: class="button primary-btn"}
- |
-
-
diff --git a/machine/overview.md b/machine/overview.md
index 87264394c6..df542524e2 100644
--- a/machine/overview.md
+++ b/machine/overview.md
@@ -11,21 +11,39 @@ You can use Docker Machine to:
* Provision Swarm clusters
## What is Docker Machine?
-Docker Machine is a tool that lets you install Docker Engine on virtual hosts, and manage the hosts with `docker-machine` commands. You can use Machine to create Docker hosts on your local Mac or Windows box, on your company network, in your data center, or on cloud providers like AWS or Digital Ocean.
-Using `docker-machine` commands, you can start, inspect, stop, and restart a managed host, upgrade the Docker client and daemon, and configure a Docker client to talk to your host.
+Docker Machine is a tool that lets you install Docker Engine on virtual hosts,
+and manage the hosts with `docker-machine` commands. You can use Machine to
+create Docker hosts on your local Mac or Windows box, on your company network,
+in your data center, or on cloud providers like AWS or Digital Ocean.
-Point the Machine CLI at a running, managed host, and you can run `docker` commands directly on that host. For example, run `docker-machine env default` to point to a host called `default`, follow on-screen instructions to complete `env` setup, and run `docker ps`, `docker run hello-world`, and so forth.
+Using `docker-machine` commands, you can start, inspect, stop, and restart a
+managed host, upgrade the Docker client and daemon, and configure a Docker
+client to talk to your host.
-Machine _was_ the _only_ way to run Docker on Mac or Windows previous to Docker v1.12. Starting with the beta program and Docker v1.12, [Docker for Mac](/docker-for-mac/index.md) and [Docker for Windows](/docker-for-windows/index.md) are available as native apps and the better choice for this use case on newer desktops and laptops. We encourage you to try out these new apps. The installers for Docker for Mac and Docker for Windows include Docker Machine, along with Docker Compose.
+Point the Machine CLI at a running, managed host, and you can run `docker`
+commands directly on that host. For example, run `docker-machine env default` to
+point to a host called `default`, follow on-screen instructions to complete
+`env` setup, and run `docker ps`, `docker run hello-world`, and so forth.
-If you aren't sure where to begin, see [Get Started with Docker](/engine/getstarted/index.md), which helps you choose the right app for your system and guides you through a brief end-to-end tutorial on Docker.
+Machine _was_ the _only_ way to run Docker on Mac or Windows previous to Docker
+v1.12. Starting with the beta program and Docker v1.12, [Docker for
+Mac](/docker-for-mac/index.md) and [Docker for
+Windows](/docker-for-windows/index.md) are available as native apps and the
+better choice for this use case on newer desktops and laptops. We encourage you
+to try out these new apps. The installers for Docker for Mac and Docker for
+Windows include Docker Machine, along with Docker Compose.
+
+If you aren't sure where to begin, see [Get Started with Docker](/get-started/),
+which guides you through a brief end-to-end tutorial on Docker.
## Why should I use it?
-Docker Machine enables you to provision multiple remote Docker hosts on various flavors of Linux.
+Docker Machine enables you to provision multiple remote Docker hosts on various
+flavors of Linux.
-Additionally, Machine allows you to run Docker on older Mac or Windows systems, as described in the previous topic.
+Additionally, Machine allows you to run Docker on older Mac or Windows systems,
+as described in the previous topic.
Docker Machine has these two broad use cases.
@@ -39,28 +57,50 @@ Docker Machine has these two broad use cases.
- Docker Engine runs natively on Linux systems. If you have a Linux box as your primary system, and want to run `docker` commands, all you need to do is download and install Docker Engine. However, if you want an efficient way to provision multiple Docker hosts on a network, in the cloud or even locally, you need Docker Machine.
+ Docker Engine runs natively on Linux systems. If you have a Linux box as your
+ primary system, and want to run `docker` commands, all you need to do is
+ download and install Docker Engine. However, if you want an efficient way to
+ provision multiple Docker hosts on a network, in the cloud or even locally,
+ you need Docker Machine.
- Whether your primary system is Mac, Windows, or Linux, you can install Docker Machine on it and use `docker-machine` commands to provision and manage large numbers of Docker hosts. It automatically creates hosts, installs Docker Engine on them, then configures the `docker` clients. Each managed host ("**_machine_**") is the combination of a Docker host and a configured client.
+ Whether your primary system is Mac, Windows, or Linux, you can install Docker
+ Machine on it and use `docker-machine` commands to provision and manage large
+ numbers of Docker hosts. It automatically creates hosts, installs Docker
+ Engine on them, then configures the `docker` clients. Each managed host
+ ("**_machine_**") is the combination of a Docker host and a configured client.
## What's the difference between Docker Engine and Docker Machine?
-When people say "Docker" they typically mean **Docker Engine**, the client-server application made up of the Docker daemon, a REST API that specifies interfaces for interacting with the daemon, and a command line interface (CLI) client that talks to the daemon (through the REST API wrapper). Docker Engine accepts `docker` commands from the CLI, such as `docker run
`, `docker ps` to list running containers, `docker images` to list images, and so on.
+When people say "Docker" they typically mean **Docker Engine**, the
+client-server application made up of the Docker daemon, a REST API that
+specifies interfaces for interacting with the daemon, and a command line
+interface (CLI) client that talks to the daemon (through the REST API wrapper).
+Docker Engine accepts `docker` commands from the CLI, such as `docker run
+`, `docker ps` to list running containers, `docker images` to list
+images, and so on.
-**Docker Machine** is a tool for provisioning and managing your Dockerized hosts (hosts with Docker Engine on them). Typically, you install Docker Machine on your local system. Docker Machine has its own command line client `docker-machine` and the Docker Engine client, `docker`. You can use Machine to install Docker Engine on one or more virtual systems. These virtual systems can be local (as when you use Machine to install and run Docker Engine in VirtualBox on Mac or Windows) or remote (as when you use Machine to provision Dockerized hosts on cloud providers). The Dockerized hosts themselves can be thought of, and are sometimes referred to as, managed "**_machines_**".
+**Docker Machine** is a tool for provisioning and managing your Dockerized hosts
+(hosts with Docker Engine on them). Typically, you install Docker Machine on
+your local system. Docker Machine has its own command line client
+`docker-machine` and the Docker Engine client, `docker`. You can use Machine to
+install Docker Engine on one or more virtual systems. These virtual systems can
+be local (as when you use Machine to install and run Docker Engine in VirtualBox
+on Mac or Windows) or remote (as when you use Machine to provision Dockerized
+hosts on cloud providers). The Dockerized hosts themselves can be thought of,
+and are sometimes referred to as, managed "**_machines_**".
## Where to go next
-- [Install Docker Machine](install-machine.md)
-- Create and run a Docker host on your [local system using VirtualBox](get-started.md)
-- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
-- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md) (Legacy Swarm)
+- [Install Docker Machine](install-machine.md)
+- Create and run a Docker host on your [local system using VirtualBox](get-started.md)
+- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
+- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md) (Legacy Swarm)
- [Getting started with swarm mode](/engine/swarm/swarm-tutorial/) (Docker Engine 1.12 and above)
-- [Understand Machine concepts](concepts.md)
-- [Docker Machine driver reference](drivers/index.md)
-- [Docker Machine subcommand reference](reference/index.md)
-- [Migrate from Boot2Docker to Docker Machine](migrate-to-machine.md)
+- [Understand Machine concepts](concepts.md)
+- [Docker Machine driver reference](drivers/index.md)
+- [Docker Machine subcommand reference](reference/index.md)
+- [Migrate from Boot2Docker to Docker Machine](migrate-to-machine.md)
diff --git a/swarm/install-w-machine.md b/swarm/install-w-machine.md
index 10381e8f2d..bb0625435f 100644
--- a/swarm/install-w-machine.md
+++ b/swarm/install-w-machine.md
@@ -239,7 +239,7 @@ your swarm, and start an image on your swarm.
$ docker run -it ubuntu bash
```
- For more examples and ideas, visit the [User Guide](/engine/userguide/intro/).
+ For more examples and ideas, visit the [User Guide](/engine/userguide/).
5. Use the `docker ps` command to find out which node the container ran on.
diff --git a/toolbox/overview.md b/toolbox/overview.md
index b17b5de06f..15fe96b7c0 100644
--- a/toolbox/overview.md
+++ b/toolbox/overview.md
@@ -55,7 +55,7 @@ Toolbox includes these Docker tools:
## Next Steps
-* Try out the examples in the [Getting Started](/engine/getstarted/index.md) tutorial.
+* Try the [Get started](/get-started/) tutorial.
* Dig in deeper with [more tutorials and examples](/engine/tutorials/index.md) on building images, running containers, networking, managing data, and storing images on Docker Hub.
diff --git a/toolbox/toolbox_install_mac.md b/toolbox/toolbox_install_mac.md
index b789a5eb2d..87beec9498 100644
--- a/toolbox/toolbox_install_mac.md
+++ b/toolbox/toolbox_install_mac.md
@@ -247,7 +247,7 @@ installed as a part of the Toolbox install.
## Next Steps
-* Try out the examples in the [Getting Started](/engine/getstarted/index.md) tutorial.
+* Try the [Get started](/get-started/) tutorial.
* Dig in deeper with [more tutorials and examples](/engine/tutorials/index.md) on building images, running containers, networking, managing data, and storing images on Docker Hub.
diff --git a/toolbox/toolbox_install_windows.md b/toolbox/toolbox_install_windows.md
index 9007ccc35f..074da01d2f 100644
--- a/toolbox/toolbox_install_windows.md
+++ b/toolbox/toolbox_install_windows.md
@@ -245,7 +245,7 @@ To uninstall Toolbox on Windows, do the following:
## Next Steps
-* Try out the examples in the [Getting Started](/engine/getstarted/index.md) tutorial.
+* Try out the [Get started](/get-started/) tutorial.
* Dig in deeper with [more tutorials and examples](/engine/tutorials/index.md) on building images, running containers, networking, managing data, and storing images on Docker Hub.