From 0db1cf61c7771b626190757859d3b6b9ca2b1d59 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 25 Feb 2015 14:13:43 +1000 Subject: [PATCH 1/4] Add more details to the Azure docs Signed-off-by: Sven Dowideit --- docs/index.md | 16 +++++++++++----- 1 file changed, 11 insertions(+), 5 deletions(-) diff --git a/docs/index.md b/docs/index.md index a3b7f40e35..c01c410099 100644 --- a/docs/index.md +++ b/docs/index.md @@ -668,26 +668,32 @@ The SoftLayer driver will use `UBUNTU_LATEST` as the image type by default. #### Microsoft Azure + Create machines on [Microsoft Azure](http://azure.microsoft.com/). -You need to create a subscription with a cert. Run these commands: +You need to create a subscription with a cert. Run these commands and answer the questions: $ openssl req -x509 -nodes -days 365 -newkey rsa:1024 -keyout mycert.pem -out mycert.pem $ openssl pkcs12 -export -out mycert.pfx -in mycert.pem -name "My Certificate" $ openssl x509 -inform pem -in mycert.pem -outform der -out mycert.cer -Go to the Azure portal, go to the "Settings" page, then "Manage Certificates" and upload `mycert.cer`. +Go to the Azure portal, go to the "Settings" page (you can find the link at the bottom of the +left sidebar - you need to scroll), then "Management Certificates" and upload `mycert.cer`. Grab your subscription ID from the portal, then run `docker-machine create` with these details: - $ docker-machine create -d azure --azure-subscription-id="SUB_ID" --azure-subscription-cert="mycert.pem" + $ docker-machine create -d azure --azure-subscription-id="SUB_ID" --azure-subscription-cert="mycert.pem" A-VERY-UNIQUE-NAME Options: - - `--azure-subscription-id`: Your Azure subscription ID. + - `--azure-subscription-id`: Your Azure subscription ID (A GUID like `d255d8d7-5af0-4f5c-8a3e-1545044b861e`). - `--azure-subscription-cert`: Your Azure subscription cert. -The Azure driver uses the `b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_1-LTS-amd64-server-20140927-en-us-30GB` image by default. Note, this image is not available in the Chinese regions. In China you should specify `b549f4301d0b4295b8e76ceb65df47d4__Ubuntu-14_04_1-LTS-amd64-server-20140927-en-us-30GB` +The Azure driver uses the `b39f27a8b8c64d52b05eac6a62ebad85__Ubuntu-14_04_1-LTS-amd64-server-20140927-en-us-30GB` +image by default. Note, this image is not available in the Chinese regions. In China you should + specify `b549f4301d0b4295b8e76ceb65df47d4__Ubuntu-14_04_1-LTS-amd64-server-20140927-en-us-30GB`. + +You may need to `machine ssh` in to the virtual machine and reboot to ensure that the OS is updated. #### Openstack Create machines on [Openstack](http://www.openstack.org/software/) From 009ff3187ab5cf603ac1763c9d9d26a465ccc9f2 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 25 Feb 2015 14:34:11 +1000 Subject: [PATCH 2/4] Add some more details to the Dicital Ocean driver Signed-off-by: Sven Dowideit --- docs/index.md | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index c01c410099..294246473e 100644 --- a/docs/index.md +++ b/docs/index.md @@ -616,14 +616,20 @@ By default, the Amazon EC2 driver will use a daily image of Ubuntu 14.04 LTS. |us-gov-west-1 |ami-cf5630ec| #### Digital Ocean -Creates machines on [Digital Ocean](https://www.digitalocean.com/). You need to create a personal access token under "Apps & API" in the Digital Ocean Control Panel and pass that to `docker-machine create` with the `--digitalocean-access-token` option. + +Create Docker machines on [Digital Ocean](https://www.digitalocean.com/). + +You need to create a personal access token under "Apps & API" in the Digital Ocean +Control Panel and pass that to `docker-machine create` with the `--digitalocean-access-token` option. + + $ docker-machine create --driver digitalocean --digitalocean-access-token=aa9399a2175a93b17b1c86c807e08d3fc4b79876545432a629602f61cf6ccd6b test-this Options: - `--digitalocean-access-token`: Your personal access token for the Digital Ocean API. - `--digitalocean-image`: The name of the Digital Ocean image to use. Default: `docker` - - `--digitalocean-region`: The region to create the droplet in. Default: `nyc3` - - `--digitalocean-size`: The size of the Digital Ocean driver. Default: `512mb` + - `--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. Default: `nyc3` + - `--digitalocean-size`: The size of the Digital Ocean driver (larger than default options are of the form `2gb`). Default: `512mb` The DigitalOcean driver will use `ubuntu-14-04-x64` as the default image. From d846affb6259ae2c1cb75b8212d74057bfbb9a12 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 25 Feb 2015 15:11:00 +1000 Subject: [PATCH 3/4] Expand on the Oracle Virtualbox docs Signed-off-by: Sven Dowideit --- docs/index.md | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/docs/index.md b/docs/index.md index 294246473e..ed55819418 100644 --- a/docs/index.md +++ b/docs/index.md @@ -771,8 +771,12 @@ variable and CLI option are provided the CLI option takes the precedence. The Rackspace driver will use `598a4282-f14b-4e50-af4c-b3e52749d9f9` (Ubuntu 14.04 LTS) by default. -#### VirtualBox -Creates machines locally on [VirtualBox](https://www.virtualbox.org/). Requires VirtualBox to be installed. +#### Oracle VirtualBox + +Create machines locally using [VirtualBox](https://www.virtualbox.org/). +This driver requires VirtualBox to be installed on your host. + + $ docker-machine create --driver=virtualbox vbox-test Options: From b1622fb88e5cc2d1eb74376f50051052afa86be2 Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Wed, 25 Feb 2015 16:35:06 +1000 Subject: [PATCH 4/4] remove a, remove a duplicate line Signed-off-by: Sven Dowideit --- docs/index.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/docs/index.md b/docs/index.md index ed55819418..26a2634832 100644 --- a/docs/index.md +++ b/docs/index.md @@ -277,9 +277,6 @@ $ docker run swarm create ``` Once you have the token, you can create the cluster. - -Once you have the token, you can create the cluster. - ### Swarm Master Create the Swarm master: