Commit Graph

175 Commits

Author SHA1 Message Date
Akim Demaille 529960d5ef Docker for Machine: update (#6364) 2018-04-03 11:25:39 -07:00
macknight 0de27c2d05 __docker_machine_ps1 is not found (#6337)
Fix __docker_machine_ps1: command not found
2018-03-30 13:57:06 -07:00
Akim Demaille 14b53b68c3 Jekyll: don't put {% raw %} directives in pre blocks
Replace all occurrences of

    ```foo
    {% raw %}
    bar
    {% endraw %}
    ```

(which generates spurious empty lines in the rendered pre block) with

    {% raw %}
    ```foo
    bar
    ```
    {% endraw %}

Also, fix some occurrences where the raw section is too large and
prevented interpretation of Jekyll directives.

This is the syntax used in the documentation of Jekyll itself:

https://raw.githubusercontent.com/jekyll/jekyll/master/docs/_docs/templates.md

FTR, done with two perl substitutions:

    '^([\t ]*```[^\n]*
    )([ \t]*\{% raw %\}[^\n]*
    )' '$2$1'

and

    '^([ \t]*\{% endraw %\}[^\n]*
    )([\t ]*```[^\n]*
    )' '$2$1'

and manually tweaks.  A mechanical check would be most useful.

Signed-off-by: Akim Demaille <akim.demaille@docker.com>
2018-03-13 10:28:29 -07:00
Yonghwan SO 3e10a321f3 added missing 'end block mark' which made broken block 2018-03-08 16:51:54 -08: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 a17a47dd77
Favor docker <object> <verb> format of commands (#5914)
Remove instances of:
- docker rmi
- docker images
- docker stop
- docker rm
- docker create
- docker exec
- docker attach
2018-02-05 09:33:47 -08:00
mds1455975151 0e064795f2 Update install-machine.md (#5900)
The installation method is optimized and the installation process is more concise
2018-02-02 09:57:38 -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
chenchuk77 be9f918bd5 Update install-machine.md (#5644)
missing line continuation char at Linux instructions.
2018-01-02 09:49:52 -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
Achilleas Pipinellis 619b920291 Do not split the content inside backticks
Otherwise Markdown is broken
2017-11-10 10:31:44 -08:00
Harald Albers 265e547fd4 Fix `docker-machine mount` reference page (#5142)
* Fix reference page for `docker-machine mount`

Signed-off-by: Harald Albers <github@albersweb.de>

* Add reference page for `docker-machine mount` to navigation

Signed-off-by: Harald Albers <github@albersweb.de>
2017-10-30 09:56:26 -07:00
Gwendolynne Barr cfc6020a0a Test image background (#5082) 2017-10-24 15:10:00 -07:00
Misty Stanley-Jones bece1296f6 More improvements 2017-10-18 19:14:06 -07:00
Wang Jie 2fc29a2829 Update aws.md 2017-10-18 19:14:06 -07:00
Wang Jie 26f5666322 Update ocean.md 2017-10-18 19:14:06 -07:00
Wang Jie 4023370c01 Update get-started-cloud.md 2017-10-18 19:14:06 -07:00
Wang Jie e9fa4b8aeb Update install-machine.md 2017-10-18 19:14:06 -07:00
Joffrey F 9f6d3a44c7 Fix bad merge in vnext-machine (#4933)
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-18 19:04:43 -07:00
Anders Björklund 9ce2b2e893 Add documentation for new mount command (#4796)
The currently implementation uses sshfs (and FUSE) to mount.
It would be possible to make a Windows version, using Dokan.

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2017-10-18 19:04:43 -07:00
Anders Björklund df45999813 Add documentation for new scp --delta option (#2262)
* Add documentation for new scp --delta option

Signed-off-by: Anders F Björklund <anders.f.bjorklund@gmail.com>
2017-10-18 19:04:43 -07: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
Misty Stanley-Jones b02cca86cf Standardize on site-wide variables for Docker and component versions (#4792) 2017-10-05 16:36:03 -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
Gwendolynne Barr aecc7b7886 Add --amazonec2-open-port to example and tidy page (#4554) 2017-09-11 17:05:23 -07:00
Harald Albers ab2756873f Fix section hierarchy in machine install docs (#4443) 2017-09-11 09:54:19 -07:00
Gwendolynne Barr f8440929dd Add script to wget multiple docker-machine bash completion scripts (#4564) 2017-09-08 13:03:55 -07:00
Wang Jie 098da6fe21 Update env.md (#4485)
Change "a HTTP xxx" to "an HTTP xxx".
2017-09-01 12:59:44 -07:00
Harald Albers 3638cfa266 Fix download url for Machine's command completion (#4419) 2017-08-29 10:37:12 -07:00
Victoria Bialas cda80e0859 updates to version variables for compose and machine (#4348)
* updates to version variables for compose and machine

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

* copyedit to make Compose release version number correct

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-23 17:01:11 -07:00
Victoria Bialas e047aaec7a Clarified Machine install commands on Windows (#4327)
* added more info re: Machine install commands on Windows

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

* copyedits

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

* review comments

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

* more review comments

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

* kicking the build, added metadata for search

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-08-22 16:19:16 -07:00
adal.io 952bfe4984 Update binary URL to reflect latest release (#4028) 2017-08-01 12:23:59 -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
Wang Jie 4c2f2c1d12 Update env.md (#3892) 2017-07-18 13:47:24 -07:00
Andrew Starr-Bochicchio f16909378e Update docker-machine installation for v0.12.1 (#3843) 2017-07-10 17:27:54 -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
Victoria Bialas fe16a82946 fixed bash completion link in Machine docs (#3748)
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2017-06-29 13:01:02 -07:00