diff --git a/machine/drivers/aws.md b/machine/drivers/aws.md index 04949e08d0..890bd27cf0 100644 --- a/machine/drivers/aws.md +++ b/machine/drivers/aws.md @@ -116,18 +116,23 @@ By default, the Amazon EC2 driver uses a daily image of Ubuntu 16.04 LTS. | Region | AMI ID | | -------------- | ------------ | -| ap-northeast-1 | ami-b36d4edd | -| ap-southeast-1 | ami-1069af73 | -| ap-southeast-2 | ami-1d336a7e | -| ca-central-1 | ami-ca6ddfae | -| cn-north-1 | ami-79eb2214 | -| eu-west-1 | ami-8aa67cf9 | -| eu-central-1 | ami-fe408091 | -| sa-east-1 | ami-185de774 | -| us-east-1 | ami-26d5af4c | -| us-west-1 | ami-9cbcd2fc | -| us-west-2 | ami-16b1a077 | -| us-gov-west-1 | ami-b0bad893 | +| ap-northeast-1 | ami-785c491f | +| ap-northeast-2 | ami-94d20dfa | +| ap-southeast-1 | ami-2378f540 | +| ap-southeast-2 | ami-e94e5e8a | +| ap-south-1 | ami-49e59a26 | +| ca-central-1 | ami-7ed56a1a | +| cn-north-1 | ami-a163b4cc | +| eu-central-1 | ami-1c45e273 | +| eu-west-1 | ami-6d48500b | +| eu-west-2 | ami-cc7066a8 | +| eu-west-3 | ami-c1cf79bc | +| sa-east-1 | ami-34afc458 | +| us-east-1 | ami-d15a75c7 | +| us-east-2 | ami-8b92b4ee | +| us-west-1 | ami-73f7da13 | +| us-west-2 | ami-835b4efa | +| us-gov-west-1 | ami-939412f2 | ## Security Group diff --git a/machine/drivers/digital-ocean.md b/machine/drivers/digital-ocean.md index d00e339803..c41a2b7899 100644 --- a/machine/drivers/digital-ocean.md +++ b/machine/drivers/digital-ocean.md @@ -30,6 +30,7 @@ Control Panel and pass that to `docker-machine create` with the `--digitalocean- - `--digitalocean-backups`: Enable Digital Ocean backups for the droplet. - `--digitalocean-image`: The name of the Digital Ocean image to use. - `--digitalocean-ipv6`: Enable IPv6 support for the droplet. +- `--digitalocean-monitoring`: Enable monitoring for the droplet. - `--digitalocean-private-networking`: Enable private networking support for the droplet. - `--digitalocean-region`: The region to create the droplet in, see [Regions API](https://developers.digitalocean.com/documentation/v2/#regions) for how to get a list. - `--digitalocean-size`: The size of the Digital Ocean droplet (larger than default options are of the form `2gb`). @@ -51,9 +52,10 @@ The DigitalOcean driver uses `ubuntu-16-04-x64` as the default image. | `--digitalocean-ipv6` | `DIGITALOCEAN_IPV6` | `false` | | `--digitalocean-private-networking` | `DIGITALOCEAN_PRIVATE_NETWORKING` | `false` | | `--digitalocean-region` | `DIGITALOCEAN_REGION` | `nyc3` | -| `--digitalocean-size` | `DIGITALOCEAN_SIZE` | `512mb` | +| `--digitalocean-size` | `DIGITALOCEAN_SIZE` | `s-1vcpu-1gb` | | `--digitalocean-ssh-key-fingerprint`| `DIGITALOCEAN_SSH_KEY_FINGERPRINT`| - | | `--digitalocean-ssh-port` | `DIGITALOCEAN_SSH_PORT` | 22 | | `--digitalocean-ssh-user` | `DIGITALOCEAN_SSH_USER` | `root` | | `--digitalocean-tags` | `DIGITALOCEAN_TAGS` | - | | `--digitalocean-userdata` | `DIGITALOCEAN_USERDATA` | - | +| `--digitalocean-monitoring` | `$DIGITALOCEAN_MONITORING` | `false` | diff --git a/machine/drivers/openstack.md b/machine/drivers/openstack.md index 94639db253..c3fcdab648 100644 --- a/machine/drivers/openstack.md +++ b/machine/drivers/openstack.md @@ -35,7 +35,7 @@ Mandatory: - `--openstack-private-key-file`: Used with `--openstack-keypair-name`, associates the private key to the keypair. - `--openstack-region`: The region to work on. Can be omitted if there is only one region on the OpenStack. - `--openstack-sec-groups`: If security groups are available on your OpenStack you can specify a comma separated list - to use for the machine, such as secgrp001,secgrp002`. + to use for the machine, such as `secgrp001,secgrp002`. - `--openstack-ssh-port`: Customize the SSH port if the SSH server on the machine does not listen on the default port. - `--openstack-ssh-user`: The username to use for SSH into the machine. If not provided defaults to `root`. - `--openstack-tenant-name` or `--openstack-tenant-id`: Identify the tenant in which the machine is created. diff --git a/machine/drivers/vsphere.md b/machine/drivers/vsphere.md index 7e986a951e..f263fc799e 100644 --- a/machine/drivers/vsphere.md +++ b/machine/drivers/vsphere.md @@ -20,6 +20,7 @@ installation may also include an optional VCenter server. - `--vmwarevsphere-datacenter`: Datacenter for Docker VM (must be set to `ha-datacenter` when connecting to a single host). - `--vmwarevsphere-datastore`: Datastore for Docker VM. - `--vmwarevsphere-disk-size`: Size of disk for Docker VM (in MB). +- `--vmwarevsphere-folder`: vSphere folder for the docker VM. This folder must already exist in the datacenter. - `--vmwarevsphere-hostsystem`: vSphere compute resource where the docker VM is instantiated. This can be omitted if using a cluster with DRS. - `--vmwarevsphere-memory-size`: Size of memory for Docker VM (in MB). - `--vmwarevsphere-network`: Network where the Docker VM is attached. @@ -48,3 +49,4 @@ The VMware vSphere driver uses the latest boot2docker image. | **`--vmwarevsphere-username`** | `VSPHERE_USERNAME` | - | | `--vmwarevsphere-vcenter-port` | `VSPHERE_VCENTER_PORT` | 443 | | `--vmwarevsphere-vcenter` | `VSPHERE_VCENTER` | - | +| `--vmwarevsphere-folder` | `$VSPHERE_FOLDER` | - | diff --git a/machine/reference/regenerate-certs.md b/machine/reference/regenerate-certs.md index 8eb4659b5f..bb40c57507 100644 --- a/machine/reference/regenerate-certs.md +++ b/machine/reference/regenerate-certs.md @@ -14,7 +14,8 @@ Description: Options: - --force, -f Force rebuild and do not prompt + --force, -f Force rebuild and do not prompt + --client-certs Also regenerate client certificates and CA. ``` Regenerate TLS certificates and update the machine with new certs. @@ -26,4 +27,15 @@ $ docker-machine regenerate-certs dev Regenerate TLS machine certs? Warning: this is irreversible. (y/n): y Regenerating TLS certificates -``` \ No newline at end of file +``` + +If your certificates have expired, you'll need to regenerate the client certs +as well using the `--client-certs` option: + +```none +$ docker-machine regenerate-certs --client-certs dev +Regenerate TLS machine certs? Warning: this is irreversible. (y/n): y +Regenerating TLS certificates +Regenerating local certificates +... +```