Revert "Adding advisory warnings about docker-machine"

This commit is contained in:
Usha Mandya 2019-11-19 13:52:59 +00:00 committed by GitHub
parent 1a00f2192f
commit c6b99e2a53
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
29 changed files with 4 additions and 34 deletions

View File

@ -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: "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." 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." 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 # URL based advisories
# any URL that begins with "/engine/" will get the "engine" advisory # any URL that begins with "/engine/" will get the "engine" advisory

View File

@ -195,7 +195,6 @@
makes it really easy to create Docker hosts on your computer, on makes it really easy to create Docker hosts on your computer, on
cloud providers and inside your own data center. It creates servers, cloud providers and inside your own data center. It creates servers,
installs Docker on them, then configures the Docker client to talk to them. 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* *Also known as : docker-machine*
<a class="glossary" name="namespace">namespace</a>: | <a class="glossary" name="namespace">namespace</a>: |

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Understand concepts for Docker Machine, including drivers, base OS, IP addresses, environment variables 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 keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
title: Machine concepts and getting help title: Machine concepts and getting help

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Amazon Web Services driver for machine description: Amazon Web Services driver for machine
keywords: machine, Amazon Web Services, driver keywords: machine, Amazon Web Services, driver
title: Amazon Web Services title: Amazon Web Services

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Microsoft Azure driver for machine description: Microsoft Azure driver for machine
keywords: machine, Microsoft Azure, driver keywords: machine, Microsoft Azure, driver
title: Microsoft Azure title: Microsoft Azure

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: DigitalOcean driver for machine description: DigitalOcean driver for machine
keywords: machine, digitalocean, driver keywords: machine, digitalocean, driver
title: DigitalOcean title: DigitalOcean

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Exoscale driver for machine description: Exoscale driver for machine
keywords: machine, exoscale, driver keywords: machine, exoscale, driver
title: Exoscale title: Exoscale

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Google Compute Engine driver for machine description: Google Compute Engine driver for machine
keywords: machine, Google Compute Engine, driver keywords: machine, Google Compute Engine, driver
title: Google Compute Engine title: Google Compute Engine

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Generic driver for machine description: Generic driver for machine
keywords: machine, Generic, driver keywords: machine, Generic, driver
title: Generic title: Generic

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Microsoft Hyper-V driver for machine description: Microsoft Hyper-V driver for machine
keywords: machine, Microsoft Hyper-V, driver keywords: machine, Microsoft Hyper-V, driver
title: Microsoft Hyper-V title: Microsoft Hyper-V

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Reference for drivers Docker Machine supports description: Reference for drivers Docker Machine supports
keywords: machine, drivers, supports keywords: machine, drivers, supports
title: Machine drivers title: Machine drivers

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Linode driver for machine description: Linode driver for machine
keywords: machine, Linode, driver keywords: machine, Linode, driver
title: Linode title: Linode

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: OpenStack driver for machine description: OpenStack driver for machine
keywords: machine, OpenStack, driver keywords: machine, OpenStack, driver
title: OpenStack title: OpenStack

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Identify active machines description: Identify active machines
keywords: machine, driver, base, operating system keywords: machine, driver, base, operating system
title: Driver options and operating system defaults title: Driver options and operating system defaults

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Rackspace driver for machine description: Rackspace driver for machine
keywords: machine, Rackspace, driver keywords: machine, Rackspace, driver
title: Rackspace title: Rackspace

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: IBM Softlayer driver for machine description: IBM Softlayer driver for machine
keywords: machine, IBM Softlayer, driver keywords: machine, IBM Softlayer, driver
title: IBM Softlayer title: IBM Softlayer

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Oracle VirtualBox driver for machine description: Oracle VirtualBox driver for machine
keywords: machine, Oracle VirtualBox, driver keywords: machine, Oracle VirtualBox, driver
title: Oracle VirtualBox title: Oracle VirtualBox

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: VMware vCloud Air driver for machine description: VMware vCloud Air driver for machine
keywords: machine, VMware vCloud Air, driver keywords: machine, VMware vCloud Air, driver
title: VMware vCloud Air title: VMware vCloud Air

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: VMware Fusion driver for machine description: VMware Fusion driver for machine
keywords: machine, VMware Fusion, driver keywords: machine, VMware Fusion, driver
title: VMware Fusion title: VMware Fusion

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: VMware vSphere driver for machine description: VMware vSphere driver for machine
keywords: machine, VMware vSphere, driver keywords: machine, VMware vSphere, driver
title: VMware vSphere title: VMware vSphere

View File

@ -1,12 +1,9 @@
--- ---
advisory: machine
description: Using Docker Machine to provision hosts on AWS description: Using Docker Machine to provision hosts on AWS
keywords: docker, machine, cloud, aws keywords: docker, machine, cloud, aws
title: Amazon Web Services (AWS) EC2 example 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. 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 ### Step 1. Sign up for AWS and configure credentials

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Using Docker Machine to provision hosts on DigitalOcean description: Using Docker Machine to provision hosts on DigitalOcean
keywords: docker, machine, cloud, digitalocean keywords: docker, machine, cloud, digitalocean
title: DigitalOcean example title: DigitalOcean example

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Using Docker Machine to provision hosts on cloud providers 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 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 title: Use Docker Machine to provision hosts on cloud providers

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Introduction and Overview of Machine description: Introduction and Overview of Machine
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
title: Docker Machine title: Docker Machine

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: How to install Docker Machine description: How to install Docker Machine
keywords: machine, orchestration, install, installation, docker, documentation, uninstall Docker Machine, uninstall keywords: machine, orchestration, install, installation, docker, documentation, uninstall Docker Machine, uninstall
title: Install Docker Machine title: Install Docker Machine

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Migrate from Boot2Docker to Docker Machine description: Migrate from Boot2Docker to Docker Machine
keywords: machine, commands, boot2docker, migrate, docker keywords: machine, commands, boot2docker, migrate, docker
title: Migrate from Boot2Docker to Machine title: Migrate from Boot2Docker to Machine

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Introduction and Overview of Machine description: Introduction and Overview of Machine
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
title: Docker Machine Overview title: Docker Machine Overview

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
description: Docker Machine Commands Overview description: Docker Machine Commands Overview
keywords: machine, commands keywords: machine, commands
title: Docker Machine command-line reference title: Docker Machine command-line reference

View File

@ -1,5 +1,4 @@
--- ---
advisory: machine
title: Docker Machine release notes title: Docker Machine release notes
description: Release notes for Docker Machine description: Release notes for Docker Machine
keywords: release notes, machine keywords: release notes, machine