Charles Smith
bb41792de2
add menu.md, make index.md command line reference, update typos/minor errors in cli docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit f98f596c19
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Sebastiaan van Stijn
67f4f5d2c4
rename desired_state filter to desired-state
...
For consistency with other filters (such as
"is-official"), this renames the desired_state
filter to "desired-state".
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit d761719eb4
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Vincent Demeester
76aed24192
Improve systemd service unit in *Automatically start containers*
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 48744e03e9
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Nicola Kabar
6387822594
[Docs] clarified local volume driver docs
...
Signed-off-by: Nico <nicolaka@gmail.com>
(cherry picked from commit 841f985994
)
Signed-off-by: Tibor Vass <tibor@docker.com>
2016-07-08 15:31:22 -07:00
Damien Nadé
777c387f1e
Fixed typo: s/unqiue/unique/g
...
Signed-off-by: Damien Nadé <github@livna.org>
2016-07-05 11:16:24 +02:00
Aaron Lehmann
8a18eac752
Add documentation for external CA features in API/CLI
...
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
(cherry picked from commit fa147591ed
)
2016-07-01 00:40:48 -07:00
Keith Hudgins
17939a3159
Added HPE volume plugin listing
...
Signed-off-by: Keith Hudgins <greenman@greenman.org>
(cherry picked from commit 87ef5b4254
)
2016-07-01 00:39:50 -07:00
Antonio Murdaca
b375ccfee7
fix warn message typos
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
(cherry picked from commit a4143e6756
)
2016-06-30 17:12:37 -07:00
allencloud
49981f8327
make cmd short short consistency and change docs
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 184afb92bf
)
2016-06-30 17:11:29 -07:00
Lei Jitang
bb09b3e5f1
Remove dm.no_warn_on_loop_devices in info warning
...
I think we doesn't provide dm.no_warn_on_loop_devices option
at all. I didn't found any code to handle this option.
Signed-off-by: Lei Jitang <leijitang@huawei.com>
(cherry picked from commit 2aa01e0fbc
)
2016-06-30 16:58:15 -07:00
Sebastiaan van Stijn
99cfbbc287
docs: add note that we no longer send container-id for exec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 82876c0f5b
)
2016-06-30 16:57:32 -07:00
Vincent Demeester
5c04eab617
Fixes /swarm/join endpoint documentation
...
The JSON payload given in the API documentation is wrong, fixing it.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
(cherry picked from commit 97c9491b0d
)
2016-06-30 16:57:28 -07:00
Anton Tiurin
712cbdbe1f
Remove extra comma in Image Pull API examples
...
Signed-off-by: Anton Tiurin <noxiouz@yandex.ru>
(cherry picked from commit 307c39c187
)
2016-06-30 16:57:08 -07:00
Harald Albers
4476697867
add documentation for desired_state filter
...
Signed-off-by: Harald Albers <github@albersweb.de>
(cherry picked from commit 36f57f7d02
)
2016-06-30 16:47:53 -07:00
Charles Smith
79b488d5c4
remove margin from bottom of swarm mode docs
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 0d6f59e85a
)
2016-06-30 16:47:53 -07:00
Akihiro Suda
cab4e108c8
update storagedriver/zfs-driver.md for Ubuntu 16.04 LTS
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit ddf9b6f666
)
2016-06-30 16:47:52 -07:00
Victoria Bialas
246d503dea
added another alias for getting started stuff
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 4060eb02ef
)
2016-06-30 16:47:52 -07:00
Sebastiaan van Stijn
6ed3aaf3b6
deprecate '-h' shorthand and remove '-help'
...
This deprecates the shorthand '-h', because we don't mention it as an option,
and it conflicts with the 'docker create -h/--hostname' option, so cannot be
used for all commands consistently.
This also removes the (single-dash) '-help' option. The single-dash variant was
marked "deprecated" in version 1.5.0 (basically, since it was added in
a2b529ead2
), but still kept around to
prevent '-help' being treated as '-h -e -l -p', causing confusing
warnings.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 6add695084
)
2016-06-30 16:47:51 -07:00
allencloud
a3b8c1a80e
uppercase output in node inspect to keep consistency
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
(cherry picked from commit 89582e1a34
)
2016-06-30 16:47:50 -07:00
Alex Coventry
460418f035
Clarify role of dockerhost
variable
...
Signed-off-by: Alex Coventry <alx@empirical.com>
(cherry picked from commit 8aba9fd3ec
)
2016-06-30 16:47:50 -07:00
Tadej Janež
ea4d01f22f
Use 'default.target' in systemd unit file example
...
Previously, 'local.target' was used which is not going to work
out-of-the-box for lots of users.
The 'default.target' is the default unit systemd starts at bootup and
hence what most users would be expected to use.
Signed-off-by: Tadej Janež <tadej.j@nez.si>
(cherry picked from commit 0a8c46d5e5
)
2016-06-30 16:47:50 -07:00
Charles Smith
b6b262d8bb
correct output description - only one task is running on manager
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 5f219806fc
)
2016-06-30 16:47:48 -07:00
Serhat Gülçiçek
f4de46d2ac
Fix error for env variables example in docker reference - 2
...
The reason why the issue occurs is because sh parses the first argument after -c as the whole script to execute.
Everything after isn't executed as one might expect.
When working on the 'fix' I found out the same fix is also done in commit 2af7c5cfe2
, except only for one occurrence.
Signed-off-by: Serhat Gülçiçek <serhat+signoff@equil.nl>
(cherry picked from commit 7a30fa7af6
)
2016-06-30 16:47:46 -07:00
Sven Dowideit
eaf5b17592
Removing some url links that can be resolved using src markdown links
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 01f9cbc366
)
2016-06-30 16:47:46 -07:00
David M. Karr (fullname at gmail.com)
6de8049ab5
Update work-with-networks.md
...
The value of the Subnet and Gateway properties didn't match the command-line argument.
Signed-off-by: David M. Karr <davidmichaelkarr@gmail.com>
(cherry picked from commit a54c3fbb8a
)
2016-06-30 16:47:46 -07:00
orkaa
d4cdc5172c
For the lulz! (evalulate -> evaluate)
...
Signed-off-by: orkaa <orkica@gmail.com>
(cherry picked from commit 1bdbfa5770
)
2016-06-30 16:47:45 -07:00
Kai Qiang Wu(Kennan)
db4153cc90
Fix the missing 'ls'
...
Signed-off-by: Kai Qiang Wu(Kennan) <wkq5325@gmail.com>
(cherry picked from commit cbd240581f
)
2016-06-30 16:47:43 -07:00
Eric Barch
060b6c4363
Add missing words in the swarm docs
...
Signed-off-by: Eric Barch <barch@tomesoftware.com>
(cherry picked from commit db158e9182
)
2016-06-30 16:47:43 -07:00
bin liu
6a5a150722
fix some typos
...
Signed-off-by: bin liu <liubin0329@gmail.com>
(cherry picked from commit 950073aabb
)
2016-06-30 16:47:43 -07:00
Sven Dowideit
3d5903a45f
Now that the Docker4 links are online, we can use them
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit 587d2f9d81
)
2016-06-30 16:47:42 -07:00
Akihiro Suda
ba77356d98
Add overlay2 description to overlayfs-driver.md
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
(cherry picked from commit 8625adbd67
)
2016-06-30 16:47:42 -07:00
Shishir Mahajan
16274ba940
PR 19367 doc change: Mention supported drivers for --storage-opt size option in docker create/run.
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
(cherry picked from commit fe6416d04f
)
2016-06-30 16:47:41 -07:00
Kevin Jing Qiu
c7d35daad8
Fix some doc typos and spacings
...
Signed-off-by: Kevin Jing Qiu <kevin@idempotent.ca>
(cherry picked from commit 3b2ee9a704
)
2016-06-30 16:47:40 -07:00
Sebastiaan van Stijn
1b053efb5a
Sync API changes from 1.25 -> 1.24
...
commit 79e1d3877a
updated the v1.25 API with changes in SwarmKit,
but these changes should apply to v1.24.
This updates the 1.24 API with the same changes.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 93095b1699
)
2016-06-30 16:47:40 -07:00
Charles Smith
803b4d30a6
clarify swarm concept
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit e029631713
)
2016-06-30 16:47:40 -07:00
Charles Smith
3f276b58a5
update docker swarm cli
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 78ebfaff1a
)
2016-06-30 16:47:39 -07:00
Charles Smith
1784366694
add links to swarm and service commands to swarm mode overview
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit c13c560196
)
2016-06-30 16:47:37 -07:00
Yong Tang
abb6e38208
Fix reference link error in Jenkins docs failure
...
This fix fixes one of the Jenkins docs failure:
https://jenkins.dockerproject.org/job/docs-docker-pr/9754/
There are 7 errors. This fix addresses one:
`* link error: (in page engine/userguide/storagedriver/device-mapper-driver.md) ../../reference/commandline/dockerd/#storage-driver-options`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
(cherry picked from commit 1cb7fb4d2e
)
2016-06-30 16:47:37 -07:00
Charles Chan
fe2a9bea38
Update help output to match Docker 1.11.
...
* Also touch up headings.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
(cherry picked from commit 17ae6539f6
)
2016-06-18 20:58:25 -07:00
Charles Smith
dd39dbe79c
update cli commands output for rc1, revise key concepts
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 9499d5fd52
)
2016-06-18 20:58:25 -07:00
Sven Dowideit
e8e1fbb72f
bad url
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit c2495dbe6d
)
2016-06-18 20:58:25 -07:00
Sven Dowideit
d546db33ff
href links are not converted from file.md by hugo
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit ad1819ca1d
)
2016-06-18 20:58:24 -07:00
Sebastiaan van Stijn
d5c89ec65e
Add initial "service" docs
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit f565bc7ec9
)
2016-06-18 20:58:23 -07:00
Victoria Bialas
d1c91b41e1
install mac and win pared down, link to d4mac, d4win, getting started improved, added menu.md's
...
fixing links to d4mac and d4win
updates per @Sven and @theJeztah, fixing links, typos, menu definitions, etc.
updates per Sven's comments in the PR
removed duplicate line in tutorials menu.md
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
(cherry picked from commit 5bc730eda7
)
2016-06-18 20:58:23 -07:00
Charles Smith
aa1f241894
update output for node commands, minor edits
...
Signed-off-by: Charles Smith <charles.smith@docker.com>
(cherry picked from commit 3b2132c2c7
)
2016-06-16 23:36:59 -07:00
Tonis Tiigi
ab6abb799b
Add cert-expiry to swarm update
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
(cherry picked from commit 7d8d51aa9d
)
2016-06-16 23:36:58 -07:00
Sebastiaan van Stijn
fdb5324595
Update docker info output example
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit 07e1c62bf4
)
2016-06-16 23:36:56 -07:00
Sebastiaan van Stijn
c73e56fd7f
docs: move "advisory" to general metadata
...
the advisory option should not be
below "menu"
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
(cherry picked from commit aadd88c306
)
2016-06-16 23:36:55 -07:00
Sven Dowideit
af3b1c7370
advisory can't be in the [menu] section
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
(cherry picked from commit bc033cb706
)
2016-06-16 23:36:54 -07:00
Daniel Nephin
41d72e28c3
Change SCALE to REPLICAS.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
(cherry picked from commit 4df0349948
)
2016-06-16 23:36:52 -07:00