Skip to content

Commit 75fe044

Browse files
gdevillelejohndmulhausen
authored andcommitted
fix type of keywords entry in frontmatter (in /machine/) (docker#556)
keywords should be a string, not an array containing one string Signed-off-by: Gaetan de Villele <[email protected]>
1 parent 01a3ba1 commit 75fe044

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+101
-151
lines changed

index.md

+3-4
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
22
description: Home page for Docker's documentation
3-
keywords:
4-
- Docker, documentation, manual, guide, reference, api
5-
title: Welcome to the Docs
3+
keywords: Docker, documentation, manual, guide, reference, api
64
layout: docs
5+
title: Welcome to the Docs
76
---
87

98
{% include content/docker_elevator_pitch.md %}
@@ -140,4 +139,4 @@ layout: docs
140139
</div>
141140
</li>
142141
</ul>
143-
</section>
142+
</section>

machine/DRIVER_SPEC.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
---
22
description: machine
3+
keywords: machine, orchestration, install, installation, docker, documentation
34
published: false
4-
keywords:
5-
- machine, orchestration, install, installation, docker, documentation
65
title: Machine driver specification v1
76
---
87

@@ -141,4 +140,4 @@ a `GetCreateFlags` func. For example:
141140
## Examples
142141

143142
You can reference the existing [Drivers](https://github.com/docker/machine/tree/master/drivers)
144-
as well.
143+
as well.

machine/completion.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Install Machine command-line completion
3-
keywords:
4-
- machine, docker, orchestration, cli, reference
3+
keywords: machine, docker, orchestration, cli, reference
54
title: Command-line completion
65
---
76

@@ -49,4 +48,4 @@ Then reload your shell
4948
## Available completions
5049
5150
**TODO**
52-
<![end-metadata]-->
51+
<![end-metadata]-->

machine/concepts.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Understand concepts for Docker Machine, including drivers, base OS, IP addresses, environment variables
3-
keywords:
4-
- docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
3+
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
54
title: Machine concepts and getting help
65
---
76

@@ -94,4 +93,4 @@ For more information and resources, please visit
9493
- Create and run a Docker host on your [local system using VirtualBox](get-started.md)
9594
- Provision multiple Docker hosts [on your cloud provider](get-started-cloud.md)
9695
- <a href="../drivers/" target="_blank">Docker Machine driver reference</a>
97-
- <a href="../reference/" target="_blank">Docker Machine subcommand reference</a>
96+
- <a href="../reference/" target="_blank">Docker Machine subcommand reference</a>

machine/drivers/aws.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Amazon Web Services driver for machine
3-
keywords:
4-
- machine, Amazon Web Services, driver
3+
keywords: machine, Amazon Web Services, driver
54
title: Amazon Web Services
65
---
76

@@ -160,4 +159,4 @@ The default SSH username for the default AMIs is `ubuntu`.
160159

161160
You need to change the SSH username only if the custom AMI you use has a different SSH username.
162161

163-
You can change the SSH username with the `--amazonec2-ssh-user` according to the AMI you selected with the `--amazonec2-ami`.
162+
You can change the SSH username with the `--amazonec2-ssh-user` according to the AMI you selected with the `--amazonec2-ami`.

machine/drivers/azure.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Microsoft Azure driver for machine
3-
keywords:
4-
- machine, Microsoft Azure, driver
3+
keywords: machine, Microsoft Azure, driver
54
title: Microsoft Azure
65
---
76

@@ -117,4 +116,4 @@ rules and open ports of the machine from the [Azure Portal][portal].
117116

118117
[arm]: https://azure.microsoft.com/en-us/documentation/articles/resource-group-overview/
119118
[nsg]: https://azure.microsoft.com/en-us/documentation/articles/virtual-networks-nsg/
120-
[portal]: https://portal.azure.com/
119+
[portal]: https://portal.azure.com/

machine/drivers/digital-ocean.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Digital Ocean driver for machine
3-
keywords:
4-
- machine, Digital Ocean, driver
3+
keywords: machine, Digital Ocean, driver
54
title: Digital Ocean
65
---
76

@@ -44,4 +43,4 @@ The DigitalOcean driver will use `ubuntu-15-10-x64` as the default image.
4443
| `--digitalocean-userdata` | `DIGITALOCEAN_USERDATA` | - |
4544
| `--digitalocean-ssh-user` | `DIGITALOCEAN_SSH_USER` | `root` |
4645
| `--digitalocean-ssh-port` | `DIGITALOCEAN_SSH_PORT` | 22 |
47-
| `--digitalocean-ssh-key-fingerprint`| `DIGITALOCEAN_SSH_KEY_FINGERPRINT`| - |
46+
| `--digitalocean-ssh-key-fingerprint`| `DIGITALOCEAN_SSH_KEY_FINGERPRINT`| - |

machine/drivers/exoscale.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Exoscale driver for machine
3-
keywords:
4-
- machine, exoscale, driver
3+
keywords: machine, exoscale, driver
54
title: Exoscale
65
---
76

@@ -45,4 +44,4 @@ There is a limit to the number of docker machines that an anti-affinity group ca
4544
| `--exoscale-availability-zone` | `EXOSCALE_AVAILABILITY_ZONE` | `ch-dk-2` |
4645
| `--exoscale-ssh-user` | `EXOSCALE_SSH_USER` | `ubuntu` |
4746
| `--exoscale-userdata` | `EXOSCALE_USERDATA` | - |
48-
| `--exoscale-affinity-group` | `EXOSCALE_AFFINITY_GROUP` | `docker-machine` |
47+
| `--exoscale-affinity-group` | `EXOSCALE_AFFINITY_GROUP` | `docker-machine` |

machine/drivers/gce.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Google Compute Engine driver for machine
3-
keywords:
4-
- machine, Google Compute Engine, driver
3+
keywords: machine, Google Compute Engine, driver
54
title: Google Compute Engine
65
---
76

@@ -69,4 +68,4 @@ list of image URLs run:
6968
| `--google-preemptible` | `GOOGLE_PREEMPTIBLE` | - |
7069
| `--google-tags` | `GOOGLE_TAGS` | - |
7170
| `--google-use-internal-ip` | `GOOGLE_USE_INTERNAL_IP` | - |
72-
| `--google-use-existing` | `GOOGLE_USE_EXISTING` | - |
71+
| `--google-use-existing` | `GOOGLE_USE_EXISTING` | - |

machine/drivers/generic.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Generic driver for machine
3-
keywords:
4-
- machine, Generic, driver
3+
keywords: machine, Generic, driver
54
title: Generic
65
---
76

@@ -57,4 +56,4 @@ as a sudoer with `NOPASSWD`. See https://help.ubuntu.com/community/Sudoers.
5756
| **`--generic-ip-address`** | `GENERIC_IP_ADDRESS` | - |
5857
| `--generic-ssh-key` | `GENERIC_SSH_KEY` | - |
5958
| `--generic-ssh-user` | `GENERIC_SSH_USER` | `root` |
60-
| `--generic-ssh-port` | `GENERIC_SSH_PORT` | `22` |
59+
| `--generic-ssh-port` | `GENERIC_SSH_PORT` | `22` |

machine/drivers/hyper-v.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Microsoft Hyper-V driver for machine
3-
keywords:
4-
- machine, Microsoft Hyper-V, driver
3+
keywords: machine, Microsoft Hyper-V, driver
54
title: Microsoft Hyper-V
65
---
76

@@ -131,4 +130,4 @@ you can create these swarm nodes: `manager1`, `worker1`, `worker2`.
131130
```shell
132131
docker-machine create -d hyperv --hyperv-virtual-switch "Primary Virtual Switch" worker1
133132
docker-machine create -d hyperv --hyperv-virtual-switch "Primary Virtual Switch" worker2
134-
```
133+
```

machine/drivers/index.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Reference for drivers Docker Machine supports
3-
keywords:
4-
- machine, drivers, supports
3+
keywords: machine, drivers, supports
54
title: Drivers
65
---
76

@@ -18,4 +17,4 @@ title: Drivers
1817
- [Oracle VirtualBox](virtualbox.md)
1918
- [VMware vCloud Air](vm-cloud.md)
2019
- [VMware Fusion](vm-fusion.md)
21-
- [VMware vSphere](vsphere.md)
20+
- [VMware vSphere](vsphere.md)

machine/drivers/openstack.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: OpenStack driver for machine
3-
keywords:
4-
- machine, OpenStack, driver
3+
keywords: machine, OpenStack, driver
54
title: OpenStack
65
---
76

@@ -69,4 +68,4 @@ Mandatory:
6968
| `--openstack-ssh-user` | `OS_SSH_USER` | `root` |
7069
| `--openstack-tenant-id` | `OS_TENANT_ID` | - |
7170
| `--openstack-tenant-name` | `OS_TENANT_NAME` | - |
72-
| `--openstack-username` | `OS_USERNAME` | - |
71+
| `--openstack-username` | `OS_USERNAME` | - |

machine/drivers/os-base.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Identify active machines
3-
keywords:
4-
- machine, driver, base, operating system
3+
keywords: machine, driver, base, operating system
54
title: Driver options and operating system defaults
65
---
76

@@ -48,4 +47,4 @@ provider's image flag and one of its available images. For example, to select a
4847
If you change the base image for a provider, you may also need to change
4948
the SSH user. For example, the default Red Hat AMI on EC2 expects the
5049
SSH user to be `ec2-user`, so you would have to specify this with
51-
`--amazonec2-ssh-user ec2-user`.
50+
`--amazonec2-ssh-user ec2-user`.

machine/drivers/rackspace.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Rackspace driver for machine
3-
keywords:
4-
- machine, Rackspace, driver
3+
keywords: machine, Rackspace, driver
54
title: Rackspace
65
---
76

@@ -37,4 +36,4 @@ The Rackspace driver will use `59a3fadd-93e7-4674-886a-64883e17115f` (Ubuntu 15.
3736
| `--rackspace-flavor-id` | `OS_FLAVOR_ID` | `general1-1` |
3837
| `--rackspace-ssh-user` | - | `root` |
3938
| `--rackspace-ssh-port` | - | `22` |
40-
| `--rackspace-docker-install` | - | `true` |
39+
| `--rackspace-docker-install` | - | `true` |

machine/drivers/soft-layer.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: IBM Softlayer driver for machine
3-
keywords:
4-
- machine, IBM Softlayer, driver
3+
keywords: machine, IBM Softlayer, driver
54
title: IBM Softlayer
65
---
76

@@ -52,4 +51,4 @@ The SoftLayer driver will use `UBUNTU_LATEST` as the image type by default.
5251
| `--softlayer-private-net-only` | `SOFTLAYER_PRIVATE_NET` | `false` |
5352
| `--softlayer-image` | `SOFTLAYER_IMAGE` | `UBUNTU_LATEST` |
5453
| `--softlayer-public-vlan-id` | `SOFTLAYER_PUBLIC_VLAN_ID` | `0` |
55-
| `--softlayer-private-vlan-id` | `SOFTLAYER_PRIVATE_VLAN_ID` | `0` |
54+
| `--softlayer-private-vlan-id` | `SOFTLAYER_PRIVATE_VLAN_ID` | `0` |

machine/drivers/virtualbox.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Oracle VirtualBox driver for machine
3-
keywords:
4-
- machine, Oracle VirtualBox, driver
3+
keywords: machine, Oracle VirtualBox, driver
54
title: Oracle VirtualBox
65
---
76

@@ -90,4 +89,4 @@ contents.
9089

9190
This will often cause problems when using a web server such as nginx to serve
9291
static files from a shared volume. For development environments, a good
93-
workaround is to disable sendfile in your server configuration.
92+
workaround is to disable sendfile in your server configuration.

machine/drivers/vm-cloud.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: VMware vCloud Air driver for machine
3-
keywords:
4-
- machine, VMware vCloud Air, driver
3+
keywords: machine, VMware vCloud Air, driver
54
title: VMware vCloud Air
65
---
76

@@ -47,4 +46,4 @@ The VMware vCloud Air driver will use the `Ubuntu Server 12.04 LTS (amd64 201409
4746
| `--vmwarevcloudair-cpu-count` | `VCLOUDAIR_CPU_COUNT` | `1` |
4847
| `--vmwarevcloudair-memory-size` | `VCLOUDAIR_MEMORY_SIZE` | `2048` |
4948
| `--vmwarevcloudair-ssh-port` | `VCLOUDAIR_SSH_PORT` | `22` |
50-
| `--vmwarevcloudair-docker-port` | `VCLOUDAIR_DOCKER_PORT` | `2376` |
49+
| `--vmwarevcloudair-docker-port` | `VCLOUDAIR_DOCKER_PORT` | `2376` |

machine/drivers/vm-fusion.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: VMware Fusion driver for machine
3-
keywords:
4-
- machine, VMware Fusion, driver
3+
keywords: machine, VMware Fusion, driver
54
title: VMware Fusion
65
---
76

@@ -30,4 +29,4 @@ See [frapposelli/boot2docker](https://github.com/frapposelli/boot2docker/tree/vm
3029
| `--vmwarefusion-cpu-count` | `FUSION_CPU_COUNT` | `1` |
3130
| `--vmwarefusion-disk-size` | `FUSION_DISK_SIZE` | `20000` |
3231
| `--vmwarefusion-memory-size` | `FUSION_MEMORY_SIZE` | `1024` |
33-
| `--vmwarefusion-no-share` | `FUSION_NO_SHARE` | `false` |
32+
| `--vmwarefusion-no-share` | `FUSION_NO_SHARE` | `false` |

machine/drivers/vsphere.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: VMware vSphere driver for machine
3-
keywords:
4-
- machine, VMware vSphere, driver
3+
keywords: machine, VMware vSphere, driver
54
title: VMware vSphere
65
---
76

@@ -45,4 +44,4 @@ The VMware vSphere driver uses the latest boot2docker image.
4544
| `--vmwarevsphere-datastore` | `VSPHERE_DATASTORE` | - |
4645
| `--vmwarevsphere-datacenter` | `VSPHERE_DATACENTER` | - |
4746
| `--vmwarevsphere-pool` | `VSPHERE_POOL` | - |
48-
| `--vmwarevsphere-hostsystem` | `VSPHERE_HOSTSYSTEM` | - |
47+
| `--vmwarevsphere-hostsystem` | `VSPHERE_HOSTSYSTEM` | - |

machine/examples/aws.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Using Docker Machine to provision hosts on AWS
3-
keywords:
4-
- docker, machine, cloud, aws
3+
keywords: docker, machine, cloud, aws
54
title: Amazon Web Services (AWS) EC2 example
65
---
76

@@ -123,4 +122,4 @@ To remove an instance and all of its containers and images, first stop the machi
123122
- [Understand Machine concepts](../concepts.md)
124123
- [Docker Machine driver reference](../drivers/index.md)
125124
- [Docker Machine subcommand reference](../reference/index.md)
126-
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)
125+
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)

machine/examples/index.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
---
22
description: Examples of cloud installs
3-
keywords:
4-
- docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
3+
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
54
title: Learn by example
65
---
76

87
- [Digital Ocean Example](ocean.md)
9-
- [AWS Example](aws.md)
8+
- [AWS Example](aws.md)

machine/examples/ocean.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Using Docker Machine to provision hosts on Digital Ocean
3-
keywords:
4-
- docker, machine, cloud, digital ocean
3+
keywords: docker, machine, cloud, digital ocean
54
title: Digital Ocean example
65
---
76

@@ -137,4 +136,4 @@ If you create a host with Docker Machine, but remove it through the cloud provid
137136
- [Understand Machine concepts](../concepts.md)
138137
- [Docker Machine driver reference](../drivers/index.md)
139138
- [Docker Machine subcommand reference](../reference/index.md)
140-
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)
139+
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)

machine/get-started-cloud.md

+2-3
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
---
22
description: Using Docker Machine to provision hosts on cloud providers
3-
keywords:
4-
- docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
3+
keywords: docker, machine, amazonec2, azure, digitalocean, google, openstack, rackspace, softlayer, virtualbox, vmwarefusion, vmwarevcloudair, vmwarevsphere, exoscale
54
title: Use Docker Machine to provision hosts on cloud providers
65
---
76

@@ -78,4 +77,4 @@ Docker Machine can also provision <a href="https://docs.docker.com/swarm/overvie
7877
- [Understand Machine concepts](concepts.md)
7978
- [Docker Machine driver reference](drivers/index.md)
8079
- [Docker Machine subcommand reference](reference/index.md)
81-
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)
80+
- [Provision a Docker Swarm cluster with Docker Machine](/swarm/provision-with-machine.md)

0 commit comments

Comments
 (0)