b32713bed1
Merge pull request #18606 from runcom/dmwtf
...
devmapper: store base device fs type
2015-12-15 12:22:15 +01:00
98d97743d2
Merge pull request #18536 from WeiZhang555/daemon-err
...
Better error message for invalid unix socket format
2015-12-15 11:51:47 +01:00
f22ee02c6d
devmapper: store base device fs type
...
After the very first init of the graph `docker info` correctly shows the
base fs type under `Backing Filesystem`. This information isn't stored
anywhere. After a restart (w/o erasing `/var/lib/docker`) `docker info`
shows an empty string under `Backing Filesystem`.
This patch records the base fs type after the first run in the metadata
or, to fix old devices that don't have this info in the metadata, just
probe the fs type of the base device at graph startup.
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2015-12-15 09:33:19 +01:00
6c0c199103
Merge pull request #18659 from Mashimiao/blkio-bps-tfix
...
tfix: modify internal variable name to be lower-case
2015-12-15 09:20:15 +01:00
a398536d5e
Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix
...
Make all the devmapper log messages consistent with a common prefix.
2015-12-15 00:08:00 -05:00
2ec34dca05
Merge pull request #18650 from calavera/remove_httputils_dep_from_api
...
Remove httputils dependency from API client lib.
2015-12-14 20:51:53 -08:00
9b584781ad
Make pkg/devicemapper/ log messages with a common, consistent prefix.
...
Closes #16667
Uses the prefix "devicemapper:" for all the fmt and logrus error, debug, and info messages.
Signed-off-by: Chris Dituri <csdituri@gmail.com>
2015-12-14 21:35:15 -06:00
0aa6ace6e6
Make daemon/graphdriver/devmapper log messages with a common, consistent prefix.
...
Closes #16667
Uses the prefix "devmapper:" for all the fmt and logrus error, debug, and info messages.
Signed-off-by: Chris Dituri <csdituri@gmail.com>
2015-12-14 21:35:13 -06:00
20012e423c
Better error message for invalid unix socket format
...
Give more meaningful error prompts when user try to bind a directory as
unix socket.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2015-12-15 10:05:58 +08:00
38797ca61b
tfix: modify internal variable name to be lower-case
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com>
2015-12-15 09:50:16 +08:00
8970337f60
Merge pull request #18649 from albers/completion-daemon--authz-plugin
...
bash completion for `docker daemon --authz-plugin`
2015-12-14 23:13:21 +01:00
87740d001c
Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib
...
Remove timeout shared function.
2015-12-14 23:05:29 +01:00
a7e30a4ffb
Merge pull request #18643 from tianon/apt-get-clean
...
Remove mention of "apt-get clean" as it's performed automatically
2015-12-14 22:54:17 +01:00
83b5729f64
Remove httputils dependency from API client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 16:48:59 -05:00
260cbb19c9
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
2015-12-14 13:32:01 -08:00
069fe81fa6
bash completion for `docker daemon --authz-plugin`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-12-14 13:25:45 -08:00
ecc3717cb1
Merge pull request #18612 from mrunalp/update_runc
...
Update runc/libcontainer to v0.0.6
2015-12-14 13:05:53 -08:00
226329e540
Remove mention of "apt-get clean" as it's performed automatically
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
2015-12-14 12:50:44 -08:00
6e85d30f1b
Merge pull request #18645 from sdurrheimer/zsh-completion-daemon-authz-plugin
...
Zsh completion daemon authz plugin
2015-12-14 12:50:14 -08:00
4ba173630a
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-12-14 21:20:49 +01:00
76844d786b
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-12-14 21:16:54 +01:00
75d69ce0da
Merge pull request #18637 from dnephin/move_auth_config
...
Move more api types to api/types package
2015-12-14 11:53:30 -08:00
0c2dd27581
Merge pull request #18642 from tophj-ibm/add-z-unshare-image
...
Add unshare image to s390x Dockerfile
2015-12-14 11:32:27 -08:00
9dc7d07fc1
Remove timeout shared function.
...
Handle timeouts when it's necessary based on a Timeout interface.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 14:24:21 -05:00
984282e28c
Merge pull request #18639 from calavera/force_api_version
...
Force API versioning in the client library.
2015-12-14 11:20:12 -08:00
03e2923e42
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
2015-12-14 10:41:56 -08:00
b13fd10109
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
2015-12-14 10:32:53 -08:00
52e53814ea
Add unshare image to s390x Dockerfile
...
This adds unshare image to Dockerfile.s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2015-12-14 12:16:18 -06:00
c38aa60180
Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
...
Enable ptrace in a container on apparmor below 2.9
2015-12-14 10:07:01 -08:00
b679eb9a82
Force API versioning in the client library.
...
Remove dependencies on docker's version packages.
Allow empty version as a fallback to latest version.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-14 12:06:42 -05:00
96c10098ac
Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-14 11:28:02 -05:00
44299989b2
Merge pull request #18631 from tiborvass/cleanup-utils
...
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
2015-12-14 17:22:01 +01:00
5b321e3287
Move AuthConfig to api/types
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-14 11:22:01 -05:00
5e0283effa
Merge pull request #18618 from dnephin/refactor_resolve_auth_config
...
Refactor ResolveAuthConfig to remove the builder dependency on cli code
2015-12-14 15:23:36 +01:00
63e3816c1d
utils: move dockerignore function to builder/dockerignore
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-14 14:59:52 +01:00
135cca6f52
utils: move git functions to pkg/gitutils
...
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-12-14 14:59:52 +01:00
f8bc4ed573
Merge pull request #18112 from daehyeok/fix_dry_run_test
...
Change TestRunNonRootUserResolvName Fail log.
2015-12-14 13:31:17 +01:00
5fd9a8f603
Merge pull request #18616 from calavera/move_client_version_to_docker_cli
...
Move client version to the docker cli.
2015-12-14 11:43:01 +01:00
ba6b69adc2
Change TestRunNonRootUserResolvName Fail log.
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com>
2015-12-13 19:59:51 -07:00
ec1002db58
Merge pull request #18623 from jutaz/bugfix/typos
...
Bugfix - Typos
2015-12-13 19:52:31 +01:00
927b334ebf
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com>
2015-12-13 18:04:12 +02:00
f5e6b09783
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
2015-12-13 14:10:46 +01:00
94026969b4
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
2015-12-12 21:39:34 -08:00
34e38312bf
Merge pull request #18438 from bfirsh/update-getting-started-in-readme
...
Link getting started in readme to installation instructions
2015-12-12 21:29:26 -08:00
a77861bca7
Update configuring Docker article
...
Signed-off-by: Jeff Johnston <jeff.johnston.mn@gmail.com>
2015-12-12 20:36:48 -06:00
51ffc088a5
Merge pull request #18270 from hqhq/hq_refactor_verify_config
...
Move verify container resources to a separate function
2015-12-12 12:47:19 +01:00
1fffc0270f
Merge pull request #15365 from twistlock/14674-docker-authz
...
Docker authorization plug-in infrastructure
2015-12-12 12:30:33 +01:00
241f6d7107
Merge pull request #18592 from hqhq/hq_fix_start
...
Add lock for container update
2015-12-12 12:17:18 +01:00
920ea13516
Refactor ResolveAuthConfig to remove the builder dependency on cli code.
...
registry.ResolveAuthConfig() only needs the AuthConfigs from the ConfigFile, so
this change passed just the AuthConfigs.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-12-11 19:31:24 -08:00
229d3bace8
Move client version to the docker cli.
...
This removes the dockerversion dependency from the client library.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-12-11 19:03:33 -05:00
Vincent Demeester