Commit Graph

199 Commits

Author SHA1 Message Date
Maria Bermudez 114baa4c13 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-11 12:23:20 -08:00
L-Hudson bb5c8e413a
Merge pull request #7837 from JoeWrightss/patch-3
Typo fixed: "Virtualbox" to "VirtualBox".
2018-12-11 13:38:48 -05:00
JoeWrightss 186dc9dc2b Fix some typos
Signed-off-by: JoeWrightss <zhoulin.xie@daocloud.io>
2018-12-11 22:34:42 +08:00
Jeffrey Morgan 5cdb36d5a1 Merge branch 'master' of github.com:docker/docker.github.io 2018-12-03 15:14:51 -05:00
Anne Henmi d02cc95e00
Merge pull request #5992 from monochromata/master
Add docker-machine-driver-hetzner
2018-11-27 09:31:35 -07:00
Jeffrey Morgan c0656fa7fa Rename official repos to official images 2018-11-21 15:19:50 -05:00
Jeffrey Morgan ca4ffb1ee2 Merge branch 'master' into consolidation-changes 2018-11-14 18:30:02 -05:00
Jeffrey Morgan d15739c5e7 Merge branch 'master' into consolidation-changes 2018-11-14 18:29:09 -05:00
Maria Bermudez 137b8b0a20
Edits 2018-11-08 16:56:27 -08:00
Maria Bermudez 6d007ada6c
Edits 2018-11-08 16:46:11 -08:00
Joffrey F 6d33979407 Update docs with latest version of docker-machine
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-11-08 14:39:25 -08:00
Jeffrey Morgan ca466a55ed Rename Docker Store and Docker Cloud - WIP 2018-10-04 19:41:32 -04:00
Oscar Caballero 269c80d2d9 Spelling revision 2018-09-23 21:43:11 +02:00
Tom Vincent 1d5d5cb29c
Fix rm removes typo 2018-08-12 10:37:34 +01:00
Gwendolynne Barr a55d0c9dfc
Cleanup (#6864) 2018-06-11 12:48:24 -07:00
Gwendolynne Barr c9e06d476f
Depersonalize docs (#6760) 2018-05-24 15:05:27 -07:00
Bogdan Despotov 62fabf592c Adding information about the CloudSigma Docker Machine driver 2018-05-15 16:52:48 -07:00
Yuki 168728283e Update index.md 2018-05-15 16:48:28 -07:00
gtardif c74f90d4da macOS 10.10 has been deprecated in 17.06 and not supported since 17.09, removing old references to it. (#6680) 2018-05-11 12:08:14 -07:00
Paul Kamer 3f4f3d1509 Adds 'digitalocean-ssh-key-path' CLI option (#6031) 2018-05-10 09:17:52 -07:00
Rajshekhar K 3993cda5c8 Update to sample output of docker-machine ls (can't have two machines… (#6666) 2018-05-10 09:14:43 -07:00
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
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
monochromata f2b111a771
Add docker-machine-driver-hetzner
Add driver for Hetzner Cloud (https://hetzner.cloud/) to list of 3rd party docker machine drivers.
2018-02-12 22:15:15 +01: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