Commit Graph

17 Commits

Author SHA1 Message Date
2f100155de Add support for DOCKER_CONFIG/--config to specific config file dir
Carry #11675

Aside from what #11675 says, to me a key usecase for this is to support
more than one Docker cli running at the same time but each may have its
own set of config files.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 408d7deaf7
Component: cli
2017-06-02 00:07:01 +00:00
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
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
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
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
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
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
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
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
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
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
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
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
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