From 6d33979407ddec72503ffc948365f99b9167110e Mon Sep 17 00:00:00 2001 From: Joffrey F Date: Thu, 8 Nov 2018 14:39:25 -0800 Subject: [PATCH] Update docs with latest version of docker-machine Signed-off-by: Joffrey F --- _config.yml | 2 +- machine/drivers/aws.md | 66 +++++++++++++++++---------------- machine/drivers/hyper-v.md | 22 ++++++----- release-notes/docker-machine.md | 39 +++++++++++++++++++ 4 files changed, 86 insertions(+), 43 deletions(-) diff --git a/_config.yml b/_config.yml index 77a399f491..d10163795a 100644 --- a/_config.yml +++ b/_config.yml @@ -24,7 +24,7 @@ docker_ce_stable_version: "18.09" docker_ce_edge_version: "18.09" docker_ee_version: "2.1" compose_version: "1.23.1" -machine_version: "0.14.0" +machine_version: "0.16.0" distribution_version: "2.6" dtr_version: "2.6" ucp_version: "3.1" diff --git a/machine/drivers/aws.md b/machine/drivers/aws.md index 890bd27cf0..b0d9a6bf55 100644 --- a/machine/drivers/aws.md +++ b/machine/drivers/aws.md @@ -60,6 +60,7 @@ You can use environment variables: - `--amazonec2-root-size`: The root disk size of the instance (in GB). - `--amazonec2-secret-key`: Your secret access key for the Amazon Web Services API. - `--amazonec2-security-group`: AWS VPC security group name. +- `--amazonec2-security-group-readonly`: Skip adding default rules to security groups. - `--amazonec2-session-token`: Your session token for the Amazon Web Services API. - `--amazonec2-spot-price`: Spot instance bid price (in dollars). Require the `--amazonec2-request-spot-instance` flag. - `--amazonec2-ssh-keypath`: Path to Private Key file to use for instance. Matching public key with .pub extension should exist @@ -77,38 +78,39 @@ You can use environment variables: #### Environment variables and default values: -| CLI option | Environment variable | Default | -|:-----------------------------------------|:-------------------------|:-----------------| -| `--amazonec2-access-key` | `AWS_ACCESS_KEY_ID` | - | -| `--amazonec2-ami` | `AWS_AMI` | `ami-c60b90d1` | -| `--amazonec2-block-duration-minutes` | - | - | -| `--amazonec2-device-name` | `AWS_DEVICE_NAME` | `/dev/sda1` | -| `--amazonec2-endpoint` | `AWS_ENDPOINT` | - | -| `--amazonec2-iam-instance-profile` | `AWS_INSTANCE_PROFILE` | - | -| `--amazonec2-insecure-transport` | `AWS_INSECURE_TRANSPORT` | - | -| `--amazonec2-instance-type` | `AWS_INSTANCE_TYPE` | `t2.micro` | -| `--amazonec2-keypair-name` | `AWS_KEYPAIR_NAME` | - | -| `--amazonec2-monitoring` | - | `false` | -| `--amazonec2-open-port` | - | - | -| `--amazonec2-private-address-only` | - | `false` | -| `--amazonec2-region` | `AWS_DEFAULT_REGION` | `us-east-1` | -| `--amazonec2-request-spot-instance` | - | `false` | -| `--amazonec2-retries` | - | `5` | -| `--amazonec2-root-size` | `AWS_ROOT_SIZE` | `16` | -| `--amazonec2-secret-key` | `AWS_SECRET_ACCESS_KEY` | - | -| `--amazonec2-security-group` | `AWS_SECURITY_GROUP` | `docker-machine` | -| `--amazonec2-session-token` | `AWS_SESSION_TOKEN` | - | -| `--amazonec2-spot-price` | - | `0.50` | -| `--amazonec2-ssh-keypath` | `AWS_SSH_KEYPATH` | - | -| `--amazonec2-ssh-user` | `AWS_SSH_USER` | `ubuntu` | -| `--amazonec2-subnet-id` | `AWS_SUBNET_ID` | - | -| `--amazonec2-tags` | `AWS_TAGS` | - | -| `--amazonec2-use-ebs-optimized-instance` | - | `false` | -| `--amazonec2-use-private-address` | - | `false` | -| `--amazonec2-userdata` | `AWS_USERDATA` | - | -| `--amazonec2-volume-type` | `AWS_VOLUME_TYPE` | `gp2` | -| `--amazonec2-vpc-id` | `AWS_VPC_ID` | - | -| `--amazonec2-zone` | `AWS_ZONE` | `a` | +| CLI option | Environment variable | Default | +|:-----------------------------------------|:------------------------------|:-----------------| +| `--amazonec2-access-key` | `AWS_ACCESS_KEY_ID` | - | +| `--amazonec2-ami` | `AWS_AMI` | `ami-c60b90d1` | +| `--amazonec2-block-duration-minutes` | - | - | +| `--amazonec2-device-name` | `AWS_DEVICE_NAME` | `/dev/sda1` | +| `--amazonec2-endpoint` | `AWS_ENDPOINT` | - | +| `--amazonec2-iam-instance-profile` | `AWS_INSTANCE_PROFILE` | - | +| `--amazonec2-insecure-transport` | `AWS_INSECURE_TRANSPORT` | - | +| `--amazonec2-instance-type` | `AWS_INSTANCE_TYPE` | `t2.micro` | +| `--amazonec2-keypair-name` | `AWS_KEYPAIR_NAME` | - | +| `--amazonec2-monitoring` | - | `false` | +| `--amazonec2-open-port` | - | - | +| `--amazonec2-private-address-only` | - | `false` | +| `--amazonec2-region` | `AWS_DEFAULT_REGION` | `us-east-1` | +| `--amazonec2-request-spot-instance` | - | `false` | +| `--amazonec2-retries` | - | `5` | +| `--amazonec2-root-size` | `AWS_ROOT_SIZE` | `16` | +| `--amazonec2-secret-key` | `AWS_SECRET_ACCESS_KEY` | - | +| `--amazonec2-security-group` | `AWS_SECURITY_GROUP` | `docker-machine` | +| `--amazonec2-security-group-readonly` | `AWS_SECURITY_GROUP_READONLY` | `false` | +| `--amazonec2-session-token` | `AWS_SESSION_TOKEN` | - | +| `--amazonec2-spot-price` | - | `0.50` | +| `--amazonec2-ssh-keypath` | `AWS_SSH_KEYPATH` | - | +| `--amazonec2-ssh-user` | `AWS_SSH_USER` | `ubuntu` | +| `--amazonec2-subnet-id` | `AWS_SUBNET_ID` | - | +| `--amazonec2-tags` | `AWS_TAGS` | - | +| `--amazonec2-use-ebs-optimized-instance` | - | `false` | +| `--amazonec2-use-private-address` | - | `false` | +| `--amazonec2-userdata` | `AWS_USERDATA` | - | +| `--amazonec2-volume-type` | `AWS_VOLUME_TYPE` | `gp2` | +| `--amazonec2-vpc-id` | `AWS_VPC_ID` | - | +| `--amazonec2-zone` | `AWS_ZONE` | `a` | ## Default AMIs diff --git a/machine/drivers/hyper-v.md b/machine/drivers/hyper-v.md index 30a3b06987..ea602571fa 100644 --- a/machine/drivers/hyper-v.md +++ b/machine/drivers/hyper-v.md @@ -38,20 +38,22 @@ Hyper-V](https://msdn.microsoft.com/en-us/virtualization/hyperv_on_windows/quick - `--hyperv-cpu-count`: Number of CPUs for the host. - `--hyperv-static-macaddress`: Hyper-V network adapter's static MAC address. - `--hyperv-vlan-id`: Hyper-V network adapter's VLAN ID if any. +- `--hyperv-disable-dynamic-memory`: Disable dynamic memory management ## Environment variables and default values -| CLI option | Environment variable | Default | -| ---------------------------- | -------------------------- | ------------------------ | -| `--hyperv-boot2docker-url` | `HYPERV_BOOT2DOCKER_URL` | _Latest boot2docker url_ | -| `--hyperv-cpu-count` | `HYPERV_CPU_COUNT` | `1` | -| `--hyperv-disk-size` | `HYPERV_DISK_SIZE` | `20000` | -| `--hyperv-memory` | `HYPERV_MEMORY` | `1024` | -| `--hyperv-static-macaddress` | `HYPERV_STATIC_MACADDRESS` | _undefined_ | -| `--hyperv-virtual-switch` | `HYPERV_VIRTUAL_SWITCH` | _first found_ | -| `--hyperv-vlan-id` | `HYPERV_VLAN_ID` | _undefined_ | +| CLI option | Environment variable | Default | +| --------------------------------- | ------------------------------- | ------------------------ | +| `--hyperv-boot2docker-url` | `HYPERV_BOOT2DOCKER_URL` | _Latest boot2docker url_ | +| `--hyperv-cpu-count` | `HYPERV_CPU_COUNT` | `1` | +| `--hyperv-disk-size` | `HYPERV_DISK_SIZE` | `20000` | +| `--hyperv-memory` | `HYPERV_MEMORY` | `1024` | +| `--hyperv-static-macaddress` | `HYPERV_STATIC_MACADDRESS` | _undefined_ | +| `--hyperv-virtual-switch` | `HYPERV_VIRTUAL_SWITCH` | _first found_ | +| `--hyperv-vlan-id` | `HYPERV_VLAN_ID` | _undefined_ | +| `--hyperv-disable-dynamic-memory` | `HYPERV_DISABLE_DYNAMIC_MEMORY` | `false` | -## Example +## Example: #### 1. Make sure Hyper-V is enabled diff --git a/release-notes/docker-machine.md b/release-notes/docker-machine.md index 0456b622b8..36aa434fa0 100644 --- a/release-notes/docker-machine.md +++ b/release-notes/docker-machine.md @@ -5,6 +5,45 @@ keywords: release notes, machine toc_max: 2 --- +## 0.16.0 (2018-11-08) + +### General + +* The default storage driver has been updated to `overlay2` for several systems +* Improved error reporting for the `ssh` subcommand when using the `--native-ssh` flag + +### Drivers + +`amazonec2` +* Improved handling of VPC errors + +`openstack` +* Machine removal no longer fails upon attempting to delete a non-existing keypair + +## 0.15.0 (2018-06-12) + +### General + +* `docker-machine` can now be installed using `go install`. +* Now built with go 1.10 +* Added keep-alive to SSH connections (#4450) + +### Drivers + +`amazonec2` +* Updated default AMIs to mitigate Meltdown and Spectre +* Added `--amazonec2-security-group-readonly` flag to prevent mutating security groups + +`exoscale` +* Updated driver to v0.9.23 + +`hyperv` +* Fixed Hyper-V pre-create issues (#4426) +* Added the ability to disable Hyper-V dynamic memory management during VM creation (`--hyperv-disable-dynamic-memory`) + +`vmwarefusion` +* Improved shell checks (#4491) + ## 0.14.0 (2018-03-06) ### General