Commit Graph

707 Commits

Author SHA1 Message Date
57bfdb01b7 Revert "Fix implicit DeviceMapper selection"
This reverts commit 0a376291b2213699f986a7bca1cc8c4f4ed00f8d.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 083daaeb2b
Component: cli
2017-06-02 00:07:00 +00:00
2ef0c4da9d daemon.md: fix placement of exec driver heading
Options for zfs storage driver were incorrectly placed
under 'exec driver options' header. Move the header to
the correct place.

Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Upstream-commit: 19e5936533
Component: cli
2017-06-02 00:07:00 +00:00
433942510e Fix example in cmdline help text to have correct output
Showing "$$ exit 13" caught my eye and wasn't correct.
While in there I also made it so the following paragraph didn't go past 80 chars

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 11e73c0252
Component: cli
2017-06-02 00:07:00 +00:00
f3727792b8 Update docker commit man page re: volumes
Update the man page for 'docker commit' to make explicit the fact that
'commit' does not save data in volumes.

Addresses comments in #7583

Signed-off-by: Lars Kellogg-Stedman <lars@redhat.com>
Upstream-commit: 569b77dda2
Component: cli
2017-06-02 00:07:00 +00:00
114a1b5710 Clarify .dockerignore example for Markdown files
The current documentation correctly states that dockerignore pattern
searches are non-recursive. However, the example given for Markdown
files seems to contradict this by saying that `*.md` will exclude *all*
Markdown files. This commit clarifies the situation by explicitly
specifying that `*.md` will only exclude files in the root directory of
the project.

Signed-off-by: Tim Wraight <tim.wraight@tangentlabs.co.uk>
Upstream-commit: 85ff60eb74
Component: cli
2017-06-02 00:07:00 +00:00
f73c587d92 Fix a broken anchor tag on the CLI builder page
Signed-off-by: Chris McKinnel <chrismckinnel@gmail.com>
Upstream-commit: c4541d3793
Component: cli
2017-06-02 00:07:00 +00:00
00bf9b7e19 Document the location of experimental binary
Some devs might want to download the binary directly,
especially for systems where the install script does not
work.

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: 54ebf2ac44
Component: cli
2017-06-02 00:07:00 +00:00
61c7fe428b Fix for broken link
The link pointed to experimental.md, but that didn't exist. It looks like README.md was intended. Probably experimental.md was renamed.

Signed-off-by: Leen Besselink <github@consolejunkie.net>
Upstream-commit: 572844ad99
Component: cli
2017-06-02 00:07:00 +00:00
758bcff07d Fix implicit DeviceMapper selection
DeviceMapper must be explicitly selected because the Docker binary might not be linked to the right devmapper library.

With this change, Docker fails fast if the driver detection finds the devicemapper directory but the driver is not the default option.
The option `override_udev_sync_check` doesn't make sense anymore, since the user must be explicit to select devicemapper, so it's being removed.
Docker fails to use devicemapper only if Docker has been built statically unless the option was explicit.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1028f69f59
Component: cli
2017-06-02 00:07:00 +00:00
43f540b400 Unify docker commands' usage in man and help
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
Upstream-commit: 75186acbff
Component: cli
2017-06-02 00:06:59 +00:00
4aa2c173ed Flag Addition: --type flag added for docker inspect command
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
Upstream-commit: 24e7d40f42
Component: cli
2017-06-02 00:06:59 +00:00
8de5fd2e46 Plugins JSON spec.
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7cd538db6f
Component: cli
2017-06-02 00:06:59 +00:00
52722c7f40 Typo in memory-swap flag
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
Upstream-commit: f7e2399648
Component: cli
2017-06-02 00:06:59 +00:00
25210bf840 Closes #13323 and carries
Entering comments

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5fbf370b98
Component: cli
2017-06-02 00:06:59 +00:00
f01f7d0493 Typo
Signed-off-by: Eric Sage <eric.david.sage@gmail.com>
Upstream-commit: 2feacfe882
Component: cli
2017-06-02 00:06:59 +00:00
d2eb4d3e3e docs: fix file's permissions
The README.md and the *.png should not have the executable
permissions, remove them.

Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Upstream-commit: 11b6e1b9fd
Component: cli
2017-06-02 00:06:59 +00:00
12591b7963 Update English expressions by review comments
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: 398c74e0a9
Component: cli
2017-06-02 00:06:59 +00:00
8f232c6c53 Add new logging driver: fluentd
Signed-off-by: TAGOMORI Satoshi <tagomoris@gmail.com>
Upstream-commit: c240006d20
Component: cli
2017-06-02 00:06:59 +00:00
d9083672d0 Fix docs for #14047
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: c2049a1703
Component: cli
2017-06-02 00:06:59 +00:00
23b01970ec Update plugins_volume.md
Signed-off-by: Mark Oates <fl0yd@me.com>
Upstream-commit: a5791e2541
Component: cli
2017-06-02 00:06:59 +00:00
b95868bcf0 man: convert docker/docs/man to docker/man
Signed-off-by: Lai Jiangshan <jiangshanlai@gmail.com>
Upstream-commit: e438dd5f6e
Component: cli
2017-06-02 00:06:59 +00:00
36c7167e96 Splitting out the cli command into parts.
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 4f9fac3803
Component: cli
2017-06-02 00:06:59 +00:00
ea0f82ab96 Set exit code of old running container as 137
Signed-off-by: Chun Chen <chenchun.feed@gmail.com>
Upstream-commit: 686e6d31e7
Component: cli
2017-06-02 00:06:59 +00:00
0bd517dc5c Breaking logging driver material out of run
- creating index which is overview of configuring logs
- linking to individual journald/fluent material
- leaving behind table and link to index in run

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2e3dc04935
Component: cli
2017-06-02 00:06:59 +00:00
6c14839c1e Move zfs options doc to the storage section.
Zfs options belong to the storage section, but they were added under the exec driver section.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 1a184988a2
Component: cli
2017-06-02 00:06:59 +00:00
9ae79c61c1 Add --log-opt to specify facility for syslog driver
Signed-off-by: Dennis Docter <dennis@d23.nl>
Upstream-commit: 6970c146e0
Component: cli
2017-06-02 00:06:59 +00:00
870bf94b3d Typo
Signed-off-by: Tobias Bradtke <webwurst@gmail.com>
Upstream-commit: eeceb060e4
Component: cli
2017-06-02 00:06:59 +00:00
f0b564c133 Update documentation for compose/swarm/network
Thanks to @aanand for help debugging

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: 5a85af0b24
Component: cli
2017-06-02 00:06:58 +00:00
dee47b32fe Add link to compose/swarm/network to readme
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
Upstream-commit: c7abe26ac1
Component: cli
2017-06-02 00:06:58 +00:00
d78016c6ec Add experimental Compose/Swarm/multi-host networking guide
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
Upstream-commit: eea6efd4d8
Component: cli
2017-06-02 00:06:58 +00:00
33262015d7 Vendoring in libnetwork for native multihost networking
- brings in vxlan based native multihost networking
- added a daemon flag required by libkv for dist kv operations
- moved the daemon flags to experimental

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: bd624770e1
Component: cli
2017-06-02 00:06:58 +00:00
f7d91b77b4 Update the zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: becaec720e
Component: cli
2017-06-02 00:06:58 +00:00
6bd6747ee8 Support downloading remote tarball contexts in builder jobs.
Signed-off-by: Moysés Borges <moysesb@gmail.com>
Upstream-commit: d7b3d72cfc
Component: cli
2017-06-02 00:06:58 +00:00
5673a4860d Initial Services docs
Signed-off-by: Dave Tucker <dt@docker.com>
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: b06c14eda9
Component: cli
2017-06-02 00:06:58 +00:00
c0b7ae4429 work on #11094 allow import from local file
Signed-off-by: Gildas Cuisinier <gildas.cuisinier@gcuisinier.net>
Upstream-commit: c1571b2a74
Component: cli
2017-06-02 00:06:58 +00:00
0384565fd6 Network UI / API docs
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: e1c14885ee
Component: cli
2017-06-02 00:06:58 +00:00
0cead707d2 Fixing seds, deleting old stuff
Signed-off-by: Mary Anthony <mary@docker.com>

Upding sed, adding script to avoid redirects, remove mkdos

Signed-off-by: Mary Anthony <mary@docker.com>

Ignoring graphics with sed

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing kitematic image

Signed-off-by: Mary Anthony <mary@docker.com>

Removing draft

Signed-off-by: Mary Anthony <mary@docker.com>

Fixing link

Signed-off-by: Mary Anthony <mary@docker.com>

removing from the menu

Signed-off-by: Mary Anthony <mary@docker.com>

Updatiing order of project material

Signed-off-by: Mary Anthony <mary@docker.com>

Removing from Regsitry v2 content per Olivier

Signed-off-by: Mary Anthony <mary@docker.com>

tweaking the touchup

Signed-off-by: Mary Anthony <mary@docker.com>

Removing include; only used four places; hugo global var replace

Signed-off-by: Mary Anthony <mary@docker.com>

Entering fixes from page-by-page

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 9916538ad8
Component: cli
2017-06-02 00:06:58 +00:00
9e52d04ed0 docker-inspect: Extend docker inspect to export image/container metadata related to graph driver
Export image/container metadata stored in graph driver. Right now 3 fields
DeviceId, DeviceSize and DeviceName are being exported from devicemapper.
Other graph drivers can export fields as they see fit.

This data can be used to mount the thin device outside of docker and tools
can look into image/container and do some kind of inspection.

Signed-off-by: Vivek Goyal <vgoyal@redhat.com>
Upstream-commit: 147a754d4a
Component: cli
2017-06-02 00:06:58 +00:00
a823c0de7c Remove sources/ under docs directory
See #13936.

Signed-off-by: ChaYoung You <yousbe@gmail.com>
Upstream-commit: 7507a5b7ab
Component: cli
2017-06-02 00:06:58 +00:00
18a7041c64 retooling for hugo
Tweaking for Hugo
Updating the Dockerfile with new sed; fix broken link on Kitematic
Fixing image pull for Dockerfile
Removing docs targets

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: d1d033701e
Component: cli
2017-06-02 00:06:58 +00:00
93ac1a1540 Add --net=container with --publish --publish-all --expose error out
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: bd7b88932c
Component: cli
2017-06-02 00:06:58 +00:00
b2011f7d28 Carry of PR #13520
Removinig files

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 2b50e0f852
Component: cli
2017-06-02 00:06:58 +00:00
63b67a1bf6 Update plugins.md
Fixed broken link.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins.md

Some other broken links!

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugin_api.md

FIxing broken links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>

Update plugins_volume.md

Fixing more links.

Signed-off-by: Amy Lindburg <amy.lindburg@docker.com>
Upstream-commit: 097c3c2e8e
Component: cli
2017-06-02 00:06:58 +00:00
b89d530f48 Update man page Dockerfile to use go-md2man v1.0.1 and go-lang 1.4
The main Dockerfile to was updated - this update brings the
sub-directory specific file inline with it.

Fixes #12866

Signed-off-by: Brian Exelbierd <bex@pobox.com>
Upstream-commit: 6e8bfc5d5e
Component: cli
2017-06-02 00:06:58 +00:00
47692c55ca Updating with fix for first line and the vieux/amy comment on website
Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 5f9164db14
Component: cli
2017-06-02 00:06:58 +00:00
83f9474db9 Moving man pages out of docs
Adding in other areas per comments
Updating with comments; equalizing generating man page info
Updating with duglin's comments
Doug is right here again;fixing.

Signed-off-by: Mary Anthony <mary@docker.com>
Upstream-commit: 77868b76b9
Component: cli
2017-06-02 00:06:57 +00:00
9db872a7cb add UDP GELF logging-driver
allows to send container logs to Graylog or Logstash.

Signed-off-by: Marius Sturm <marius@graylog.com>
Upstream-commit: 972214455d
Component: cli
2017-06-02 00:06:57 +00:00
a2cd41b75e Default events since to current time
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f062b77f18
Component: cli
2017-06-02 00:06:57 +00:00
32fcb04cb0 Typo psuedo - pseudo
Signed-off-by: ponsfrilus <ponsfrilus@gmail.com>
Upstream-commit: 355f241838
Component: cli
2017-06-02 00:06:57 +00:00
30efafda8e [docs] Update builder docs on last-modified times
Docker-DCO-1.1-Signed-off-by: Josh Hawn <josh.hawn@docker.com> (github: jlhawn)
Upstream-commit: 1de916edad
Component: cli
2017-06-02 00:06:57 +00:00