diff --git a/_data/advisories.yaml b/_data/advisories.yaml index 2a2f3d8816..cc8e6b0a03 100644 --- a/_data/advisories.yaml +++ b/_data/advisories.yaml @@ -17,7 +17,7 @@ texts: swarm: "See [Swarm mode overview](/engine/swarm/) for the orchestration features introduced in Docker Engine 1.12. Only refer to the Docker Swarm documents below for information on the standalone Swarm product." swarm-standalone: "**You are viewing docs for legacy standalone Swarm.** These topics describe standalone Docker Swarm. In Docker 1.12 and higher, [Swarm mode](/engine/swarm/) is integrated with Docker Engine. Most users should use integrated Swarm mode — a good place to start is [Getting started with swarm mode](/engine/swarm/swarm-tutorial/), [Swarm mode CLI commands](/engine/swarm/index.md#swarm-mode-cli-commands), and the [Get started with Docker walkthrough](/get-started/)). Standalone Docker Swarm is not integrated into the Docker Engine API and CLI commands." engine: "This site contains documentation for the v1.12 release candidate version of Docker Engine. For the Docker Engine v1.11 docs, see [https://docs.docker.com/v1.11/](https://docs.docker.com/v1.11/). Docker Desktop for Mac and Docker Desktop for Windows are currently in Beta." - machine: "As of July 2018, Docker Machine is in [maintenance mode](https://github.com/docker/machine/issues/4537). Only bugfixes will be added. Provisioning on a variety of cloud providers is better achieved using [infrakit](https://github.com/docker/deploykit)." + # URL based advisories # any URL that begins with "/engine/" will get the "engine" advisory diff --git a/_data/glossary.yaml b/_data/glossary.yaml index effc7b3538..13f15a1823 100644 --- a/_data/glossary.yaml +++ b/_data/glossary.yaml @@ -195,7 +195,6 @@ makes it really easy to create Docker hosts on your computer, on cloud providers and inside your own data center. It creates servers, installs Docker on them, then configures the Docker client to talk to them. - As of July 2018, Docker Machine is in maintenance mode. Only bugfixes will be added *Also known as : docker-machine* namespace: | diff --git a/machine/concepts.md b/machine/concepts.md index e152902a49..3a684f76ff 100644 --- a/machine/concepts.md +++ b/machine/concepts.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Understand concepts for Docker Machine, including drivers, base OS, IP addresses, environment variables keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale title: Machine concepts and getting help diff --git a/machine/drivers/aws.md b/machine/drivers/aws.md index 4ef5634ef4..d96bb67552 100644 --- a/machine/drivers/aws.md +++ b/machine/drivers/aws.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Amazon Web Services driver for machine keywords: machine, Amazon Web Services, driver title: Amazon Web Services diff --git a/machine/drivers/azure.md b/machine/drivers/azure.md index 6a3645153c..3c7af9a01c 100644 --- a/machine/drivers/azure.md +++ b/machine/drivers/azure.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Microsoft Azure driver for machine keywords: machine, Microsoft Azure, driver title: Microsoft Azure @@ -117,4 +116,4 @@ rules and open ports of the machine from the [Azure Portal][portal]. [arm]: https://azure.microsoft.com/en-us/documentation/articles/resource-group-overview/ [nsg]: https://azure.microsoft.com/en-us/documentation/articles/virtual-networks-nsg/ -[portal]: https://portal.azure.com/ +[portal]: https://portal.azure.com/ \ No newline at end of file diff --git a/machine/drivers/digital-ocean.md b/machine/drivers/digital-ocean.md index b657a2dcb2..20dd2b1a69 100644 --- a/machine/drivers/digital-ocean.md +++ b/machine/drivers/digital-ocean.md @@ -1,5 +1,4 @@ --- -advisory: machine description: DigitalOcean driver for machine keywords: machine, digitalocean, driver title: DigitalOcean diff --git a/machine/drivers/exoscale.md b/machine/drivers/exoscale.md index 860640f437..1d2932fee3 100644 --- a/machine/drivers/exoscale.md +++ b/machine/drivers/exoscale.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Exoscale driver for machine keywords: machine, exoscale, driver title: Exoscale diff --git a/machine/drivers/gce.md b/machine/drivers/gce.md index 2b25e93800..6ca7196be1 100644 --- a/machine/drivers/gce.md +++ b/machine/drivers/gce.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Google Compute Engine driver for machine keywords: machine, Google Compute Engine, driver title: Google Compute Engine diff --git a/machine/drivers/generic.md b/machine/drivers/generic.md index 774aca11e5..38aaf42d14 100644 --- a/machine/drivers/generic.md +++ b/machine/drivers/generic.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Generic driver for machine keywords: machine, Generic, driver title: Generic diff --git a/machine/drivers/hyper-v.md b/machine/drivers/hyper-v.md index 2b3f6dd4df..fe5e629986 100644 --- a/machine/drivers/hyper-v.md +++ b/machine/drivers/hyper-v.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Microsoft Hyper-V driver for machine keywords: machine, Microsoft Hyper-V, driver title: Microsoft Hyper-V diff --git a/machine/drivers/index.md b/machine/drivers/index.md index 1620501f96..46cd817797 100644 --- a/machine/drivers/index.md +++ b/machine/drivers/index.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Reference for drivers Docker Machine supports keywords: machine, drivers, supports title: Machine drivers diff --git a/machine/drivers/linode.md b/machine/drivers/linode.md index 56f06f8a05..89da6ae403 100644 --- a/machine/drivers/linode.md +++ b/machine/drivers/linode.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Linode driver for machine keywords: machine, Linode, driver title: Linode diff --git a/machine/drivers/openstack.md b/machine/drivers/openstack.md index 118d77fa0c..c3fcdab648 100644 --- a/machine/drivers/openstack.md +++ b/machine/drivers/openstack.md @@ -1,5 +1,4 @@ --- -advisory: machine description: OpenStack driver for machine keywords: machine, OpenStack, driver title: OpenStack diff --git a/machine/drivers/os-base.md b/machine/drivers/os-base.md index 2b062de131..6bab20fe8b 100644 --- a/machine/drivers/os-base.md +++ b/machine/drivers/os-base.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Identify active machines keywords: machine, driver, base, operating system title: Driver options and operating system defaults diff --git a/machine/drivers/rackspace.md b/machine/drivers/rackspace.md index d10b3bef50..2ab5d1b39b 100644 --- a/machine/drivers/rackspace.md +++ b/machine/drivers/rackspace.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Rackspace driver for machine keywords: machine, Rackspace, driver title: Rackspace diff --git a/machine/drivers/soft-layer.md b/machine/drivers/soft-layer.md index 886ba58fc9..a4ad5a76b3 100644 --- a/machine/drivers/soft-layer.md +++ b/machine/drivers/soft-layer.md @@ -1,5 +1,4 @@ --- -advisory: machine description: IBM Softlayer driver for machine keywords: machine, IBM Softlayer, driver title: IBM Softlayer diff --git a/machine/drivers/virtualbox.md b/machine/drivers/virtualbox.md index 7526f0a919..4a31f21e58 100644 --- a/machine/drivers/virtualbox.md +++ b/machine/drivers/virtualbox.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Oracle VirtualBox driver for machine keywords: machine, Oracle VirtualBox, driver title: Oracle VirtualBox diff --git a/machine/drivers/vm-cloud.md b/machine/drivers/vm-cloud.md index bd5c77a271..4904c08a6c 100644 --- a/machine/drivers/vm-cloud.md +++ b/machine/drivers/vm-cloud.md @@ -1,5 +1,4 @@ --- -advisory: machine description: VMware vCloud Air driver for machine keywords: machine, VMware vCloud Air, driver title: VMware vCloud Air @@ -49,4 +48,4 @@ The VMware vCloud Air driver uses the `Ubuntu Server 12.04 LTS (amd64 20140927)` | `--vmwarevcloudair-publicip` | `VCLOUDAIR_PUBLICIP` | - | | `--vmwarevcloudair-ssh-port` | `VCLOUDAIR_SSH_PORT` | `22` | | **`--vmwarevcloudair-username`** | `VCLOUDAIR_USERNAME` | - | -| `--vmwarevcloudair-vdcid` | `VCLOUDAIR_VDCID` | - | +| `--vmwarevcloudair-vdcid` | `VCLOUDAIR_VDCID` | - | \ No newline at end of file diff --git a/machine/drivers/vm-fusion.md b/machine/drivers/vm-fusion.md index 51a748b602..02208ac927 100644 --- a/machine/drivers/vm-fusion.md +++ b/machine/drivers/vm-fusion.md @@ -1,5 +1,4 @@ --- -advisory: machine description: VMware Fusion driver for machine keywords: machine, VMware Fusion, driver title: VMware Fusion diff --git a/machine/drivers/vsphere.md b/machine/drivers/vsphere.md index c1c6b5282c..a5d70091ac 100644 --- a/machine/drivers/vsphere.md +++ b/machine/drivers/vsphere.md @@ -1,5 +1,4 @@ --- -advisory: machine description: VMware vSphere driver for machine keywords: machine, VMware vSphere, driver title: VMware vSphere diff --git a/machine/examples/aws.md b/machine/examples/aws.md index 1f3a83f2c2..aba7027053 100644 --- a/machine/examples/aws.md +++ b/machine/examples/aws.md @@ -1,12 +1,9 @@ --- -advisory: machine description: Using Docker Machine to provision hosts on AWS keywords: docker, machine, cloud, aws title: Amazon Web Services (AWS) EC2 example --- -> docker-machine is unable to launch Amazon Linux machines, including ECS-Optimized instances. [Github issue](https://github.com/docker/machine/issues/3098) - Follow along with this example to create a Dockerized [Amazon Web Services (AWS)](https://aws.amazon.com/) EC2 instance. ### Step 1. Sign up for AWS and configure credentials diff --git a/machine/examples/ocean.md b/machine/examples/ocean.md index 43f4fe40c2..b0830b0f8f 100644 --- a/machine/examples/ocean.md +++ b/machine/examples/ocean.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Using Docker Machine to provision hosts on DigitalOcean keywords: docker, machine, cloud, digitalocean title: DigitalOcean example diff --git a/machine/get-started-cloud.md b/machine/get-started-cloud.md index 805bc1c748..e94c0a5670 100644 --- a/machine/get-started-cloud.md +++ b/machine/get-started-cloud.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Using Docker Machine to provision hosts on cloud providers keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale title: Use Docker Machine to provision hosts on cloud providers diff --git a/machine/index.md b/machine/index.md index d41163154f..a850137f44 100644 --- a/machine/index.md +++ b/machine/index.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Introduction and Overview of Machine keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale title: Docker Machine diff --git a/machine/install-machine.md b/machine/install-machine.md index 97318f2dc3..2330dc7da7 100644 --- a/machine/install-machine.md +++ b/machine/install-machine.md @@ -1,5 +1,4 @@ --- -advisory: machine description: How to install Docker Machine keywords: machine, orchestration, install, installation, docker, documentation, uninstall Docker Machine, uninstall title: Install Docker Machine diff --git a/machine/migrate-to-machine.md b/machine/migrate-to-machine.md index c9470d1946..c6793d3544 100644 --- a/machine/migrate-to-machine.md +++ b/machine/migrate-to-machine.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Migrate from Boot2Docker to Docker Machine keywords: machine, commands, boot2docker, migrate, docker title: Migrate from Boot2Docker to Machine diff --git a/machine/overview.md b/machine/overview.md index 59fc44441e..d8d0d35e9a 100644 --- a/machine/overview.md +++ b/machine/overview.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Introduction and Overview of Machine keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale title: Docker Machine Overview diff --git a/machine/reference/index.md b/machine/reference/index.md index bff5efe571..dffc083d91 100644 --- a/machine/reference/index.md +++ b/machine/reference/index.md @@ -1,5 +1,4 @@ --- -advisory: machine description: Docker Machine Commands Overview keywords: machine, commands title: Docker Machine command-line reference @@ -25,4 +24,4 @@ title: Docker Machine command-line reference - [status](status.md) - [stop](stop.md) - [upgrade](upgrade.md) -- [url](url.md) +- [url](url.md) \ No newline at end of file diff --git a/release-notes/docker-machine.md b/release-notes/docker-machine.md index bdc9ee066b..48190f4ddd 100644 --- a/release-notes/docker-machine.md +++ b/release-notes/docker-machine.md @@ -1,5 +1,4 @@ --- -advisory: machine title: Docker Machine release notes description: Release notes for Docker Machine keywords: release notes, machine