Commit Graph

66 Commits

Author SHA1 Message Date
Felix Härnström ec170487c6 Fix incorrect description in example (#6625) 2018-05-03 09:23:17 -07:00
Andrew Featherstone 8c56709b6f Remove incorrect '$' symbol from default values
This makes the table of default values consistent in style.
2018-04-23 16:05:01 -07:00
Joffrey F 6d40a578ba Document new additions in Machine 0.14.0
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-06 13:14:33 -08:00
Yoan Blanc d10564f5f4 machine exoscale: support SSH key file
Signed-off-by: Yoan Blanc <yoan.blanc@exoscale.ch>
2018-03-06 13:14:33 -08:00
David Archer 25d20f02d3 openstack: add option for enabling configuration drive (#5724)
Signed-off-by: David Archer <darcher@gmail.com>
2018-03-06 13:14:33 -08:00
Misty Stanley-Jones a4f5e30249
Various copyedits to reduce future tense, wordiness, and use of 'please' (#5788)
* Reword lots of instances of 'will'

* Reword lots of instances of won't

* Reword lots of instances of we'll

* Eradicate you'll

* Eradicate 'be able to' type of phrases

* Eradicate 'unable to' type of phrases

* Eradicate 'has / have to' type of phrases

* Eradicate 'note that' type of phrases

* Eradicate 'in order to' type of phrases

* Redirect to official Chef and Puppet docs

* Eradicate gratuitous 'please'

* Reduce use of e.g.

* Reduce use of i.e.

* Reduce use of N.B.

* Get rid of 'sexagesimal' and correct some errors
2018-01-25 17:37:23 -08:00
Frederic Tschannen ab7c338cca update option values (#5705)
- only lowercase availability zones are accepted in CLI options 
- only image short-names are accepted in CLI options
2018-01-18 09:40:17 -08:00
David Archer f054ed12dd openstack: add missing docs for user-data-file option (#5730)
Signed-off-by: David Archer <darcher@gmail.com>
2018-01-16 12:14:26 -08:00
Martijn van Calker 2ead7d5dd3 docs: Sort lists and tables ASC (#5600) 2017-12-26 12:51:27 -08:00
Stu 1b302910ca Update generic.md (#5610)
add info about systemd setting
2017-12-26 12:49:01 -08:00
Martijn van Calker 86fb652d05 Docs: Remove duplicated `amazonec2-userdata` flag (#5551)
* Docs: Remove duplicated `amazonec2-userdata` flag

* Docs: Remove duplicate content aws-driver/Options list

* Docs: Order list (ASC) Environment variables and default values
2017-12-21 12:07:29 -08:00
Yoan Blanc 0420829c6a driver exoscale: clarify the image template name. (#5487)
Signed-off-by: Yoan Blanc <yoan.blanc@exoscale.ch>
2017-12-14 14:44:36 -08:00
Tao Wang 18442126af Update machine drivers docs
Update Google and Rackspace default image to Ubuntu 16.04, as
docker/machine#3888 has been merged.
Add new options docs for aws, gce, rackspace and virtualbox drivers.

Signed-off-by: Tao Wang <twang2218@gmail.com>
2017-10-18 19:04:43 -07:00
Marc-Aurèle Brothier d84845f6c3 driver exoscale: update default value for affinity group (#4588)
Referring change in docker-machine
https://github.com/docker/machine/pull/4255

Signed-off-by: Marc-Aurèle Brothier <m@brothier.org>
2017-10-10 07:25:08 -07:00
Musa V. Ahmed 8c57dc0242 Update soft-layer.md (#4582)
Update soft-layer.md to include the softlayer-network-max-speed option.
2017-10-05 11:45:11 -07:00
Victoria Bialas b764ab3356 Addressed Windows issues with get started tutorial (#4675)
* how to get scp to work on Windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* clarified some commands in part 3

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* fixed links on hyperv, machine pages

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* removing notes about scp and ssh on Windows, WIP

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* WIP: adding docker-machine env commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added docker-machine env option, re-worked tabs

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* moved extra info re: docker-machine env out of note, to end of part 4

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* updated parts 4, 5 with docker-machine env, added note re: commands

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* changed rest of ssh examples, formatting fixes, copyedit

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit on docker-machine env example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* reworded note title

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-22 18:55:40 -07:00
Victoria Bialas 1f99dfa207 Add more info re: Hyper-V driver for Docker Machine on Windows, cleanup, link topics together (#4609)
* add more links and info re: Hyper-V driver for Docker Machine on Windows

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added info on where Machine data lives

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added information about the Hyper-V Manager

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* linked between docker-machine create command and other relevant topics

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedits, added Examples heading to create driver

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* clarifed docker-machine create example

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-09-13 12:30:15 -07:00
Seweryn Zeman 4597965781 Update AWS AMI id for eu-central-1 (#3999)
Updated AMI identifier
2017-08-01 11:55:15 -07:00
Victoria Bialas a922be3d0f Update admonitions CSS for consistency and better writer workflow (#4019) 2017-07-31 21:49:56 -07:00
Andrew Featherstone c7b1a8ac4b Update documentation of --vmwarevsphere-hostsystem when using DRS-enabled clusters (#3572) 2017-07-26 17:37:53 -07:00
(╯°□°)╯︵ uᴉǝssnH ɐɟɐʇsoW eb8315b793 Update DO driver docs with `digitalocean-tags` (#3870) 2017-07-26 10:09:07 -07:00
Michael D Roach 56de91e44a Update digital-ocean.md (#3783)
* Update digital-ocean.md

* Update digital-ocean.md
2017-07-07 12:47:23 -07:00
Misty Stanley-Jones 17e1da077b Tighten up base image and parent image terminology (#3720) 2017-06-28 11:56:41 -07:00
Thomas Grainger 464b983761 Add amazonec2 commands that were missing documentation (#3589) 2017-06-26 13:29:49 -07:00
Romain Rouvoy 8cc7d23ba4 doc: Docker driver for Grid 5000 infrastructure (#3360)
Adding a reference to a new DockerMachine driver made available for the Grid5000 computing infrastructure.
2017-06-22 15:41:41 -07:00
Victoria Bialas 5dbf9b660f added Machine overview to left-side toc (#3587)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-12 22:12:45 -07:00
Victoria Bialas 2d70554f86 added link to vmwareworkstation driver (#3542)
* added link to vmwareworkstation driver

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* added unofficial, unsupported

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-09 09:15:56 -07:00
Victoria Bialas 96f528f1c7 d4win troubleshooting topic on wifi, networking issues (#3497)
* d4win troubleshooting topic on wifi, networking issues

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>

* copyedit on WiFi capitalization

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-07 13:41:33 -07:00
Wang Jie 4d3967bc77 Update virtualbox.md (#3332) 2017-05-23 10:19:06 -07:00
Wang Jie 1b18dd4592 Update openstack.md (#3331) 2017-05-23 10:18:02 -07:00
Wang Jie 48662775d2 Update hyper-v.md (#3330) 2017-05-23 10:17:16 -07:00
Wang Jie d9654b8ce4 Update soft-layer.md (#3328) 2017-05-23 10:16:35 -07:00
Wang Jie a79334b194 Update gce.md (#3327) 2017-05-23 10:15:40 -07:00
Wang Jie e46fac8175 Update digital-ocean.md (#3321) 2017-05-23 10:10:57 -07:00
Wang Jie 2b79393e81 Update aws.md (#3320) 2017-05-23 10:10:20 -07:00
Jason McCallister e3a017a187 Adds note about passing boolean arguments (#3268)
Adds a sentence and example on how to use boolean arguments.
2017-05-19 15:28:09 -07:00
Steven Hanna 3cddbcb377 Emphasize external network must be used (#2990)
* Emphasize external network must be used

* Forgot a period
2017-04-21 13:24:22 -07:00
Alexandre Garnier 70fabab558 Fix docker-machine GCE options listing (#2454)
There was too many spaces and it was renedered as a code block.
2017-03-23 15:04:45 -07:00
Lars Larsson 950bd16598 added documentation for network/subnetwork flags (#2271) 2017-03-13 12:01:44 -07:00
Hugo 9c271e8761 Update hyper-v.md (#2121)
* Update hyper-v.md

* Update hyper-v.md

* Update hyper-v.md
2017-03-08 14:30:15 -08:00
Jim Galasyn e29dc60abb Fixed a typo
Fixed "instad" to "instead".
2017-02-25 16:58:19 -08:00
Victoria Bialas 7aaf72119d updated swarm and voting app tutorials per d4mac, d4win, toolbox and driver issues
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-02-23 17:48:22 -08:00
Antti Pihlaja 49bc53ba89 Update digital-ocean.md
Default image was changed to `ubuntu-16-04-x64` here: https://github.com/docker/machine/blame/master/drivers/digitalocean/digitalocean.go#L41
2017-02-11 19:48:29 +02:00
jingsam 347902de0d Update hyper-v.md 2017-01-15 15:48:16 +08:00
Shayne Wang 85b1bd6254 Update aws.md
Added ca-central-1 AMI ID (SOURCE: 099720109477/ubuntu/images/hvm-ssd/ubuntu-xenial-16.04-amd64-server-20161013), changed Ubuntu version to 16.04 LTS

Signed-off-by: Shayne Wang <shaynexwang@gmail.com>
2016-12-12 10:54:11 -08:00
Eisenberger Tamás c717eb71f7 Document virtualbox-share-folder switch of docker-machine virtual box… (#647)
* Document virtualbox-share-folder switch of docker-machine virtual box driver

* Add --virtualbox-share-folder to the fefaults table too

* Updated wording for virtualbox-share-folder

* Update virtualbox.md
2016-11-29 13:56:44 -08:00
Peter Schultz 5bde9b0fde machine/gce: explain how to use image families 2016-11-13 18:14:22 +01:00
Gaetan 75fe044313 fix type of keywords entry in frontmatter (in /machine/) (#556)
keywords should be a string, not an array containing one string

Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-11 14:51:12 -08:00
Gaetan 1589927ce8 fix duplicated titles having different values (#514)
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
2016-11-10 11:57:20 -08:00
John Mulhausen 558314bf56 Converges titles to imperative-form, front-matter based, and sentence-case (#438)
Multiple title fixes, consistency fixes, convergence into metadata-based titles.
2016-11-04 15:38:40 -07:00