eb815212b6
Merge pull request #18416 from toli/disable-official-repo-check-in-push
...
Removing the restriction to push to an 'official' repo
Upstream-commit: adf1ffd53b070443fd0f544c568e6c53d373caeb
Component: engine
2015-12-15 08:52:36 -08:00
61bb408463
Merge pull request #18531 from coolljt0725/update_container_networking_on_create
...
fix docker inspect return unconsistent network settings of created container and stopped container
Upstream-commit: 812a7c204a2396700ca1e95d949659b16302a120
Component: engine
2015-12-15 08:47:54 -08:00
34e0c13d67
fixed typo
...
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 4c1243dc76ad4afa6cfa6eec3070073ba0cb0c6a
Component: engine
2015-12-15 23:00:47 +08:00
f17065a779
Merge pull request #18664 from mqliang/patch-1
...
fix typo in runmetrics.md
Upstream-commit: effdb3b7635a832be1db9704a0264096c25130f1
Component: engine
2015-12-15 13:13:36 +01:00
9d4285ed4b
Merge pull request #18661 from zhanghuanzhong/docker-fix-a-confused-variable
...
The logName is confused here, it's a localName actually.
Upstream-commit: 7fe5631b5e043a5b1ab0b666422e6132ca60a2ce
Component: engine
2015-12-15 12:32:52 +01:00
0346aecb49
Merge pull request #18606 from runcom/dmwtf
...
devmapper: store base device fs type
Upstream-commit: b32713bed18a185ee05275bf252221f7d039c180
Component: engine
2015-12-15 12:22:15 +01:00
0b8410bce0
fix typo in runmetrics.md
...
fix typo
Signed-off-by: mqliang <mqliang.zju@gmail.com >
Upstream-commit: 941bbd57ac26d77ecf651b8e418c6ed8f08b39bd
Component: engine
2015-12-15 19:14:47 +08:00
9d8787d53c
Merge pull request #18536 from WeiZhang555/daemon-err
...
Better error message for invalid unix socket format
Upstream-commit: 98d97743d2ef40156a28f82381d60a0635a1aff8
Component: engine
2015-12-15 11:51:47 +01:00
bc2d1566f2
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 >
Upstream-commit: f22ee02c6d6bd16f2179e71366ec641a7d234e96
Component: engine
2015-12-15 09:33:19 +01:00
909e4fb76a
Merge pull request #18659 from Mashimiao/blkio-bps-tfix
...
tfix: modify internal variable name to be lower-case
Upstream-commit: 6c0c199103a40979340763467d23108553a350a6
Component: engine
2015-12-15 09:20:15 +01:00
b0c418d17a
The logName is confused here, it's a localName actually.
...
Signed-off-by: huanzhong zhang <zhanghuanzhong90@gmail.com >
Upstream-commit: badfc7e10fdc96d32190806df80b11f2fc41db13
Component: engine
2015-12-15 15:21:28 +08:00
852bc2ea6c
Merge pull request #18638 from cdituri/16667-devmapper-common-message-prefix
...
Make all the devmapper log messages consistent with a common prefix.
Upstream-commit: a398536d5e001efe06c329cdea3c33a075db8594
Component: engine
2015-12-15 00:08:00 -05:00
1902774c3d
Merge pull request #18650 from calavera/remove_httputils_dep_from_api
...
Remove httputils dependency from API client lib.
Upstream-commit: 2ec34dca050f839480e6b2f0c8b892e0a73a0d16
Component: engine
2015-12-14 20:51:53 -08:00
ba9d0503c4
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 >
Upstream-commit: 9b584781ad9c810bc9060448f391a3ae6a7d7cbb
Component: engine
2015-12-14 21:35:15 -06:00
f1d7c7a10b
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 >
Upstream-commit: 0aa6ace6e6e819551d21ebdcaa0c5802f76d7603
Component: engine
2015-12-14 21:35:13 -06:00
ed5505c1c9
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 >
Upstream-commit: 20012e423c865d12889af89f41459d30e7fe7901
Component: engine
2015-12-15 10:05:58 +08:00
49f615806b
tfix: modify internal variable name to be lower-case
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 38797ca61b6d88fe71615108897b1f7d1767f449
Component: engine
2015-12-15 09:50:16 +08:00
e85bbba160
Merge pull request #18649 from albers/completion-daemon--authz-plugin
...
bash completion for `docker daemon --authz-plugin`
Upstream-commit: 8970337f609d38dab69785f963d4a64a539ebf1b
Component: engine
2015-12-14 23:13:21 +01:00
1bf96a8c15
Merge pull request #18644 from calavera/remove_timeout_func_dependency_from_api_lib
...
Remove timeout shared function.
Upstream-commit: 87740d001c5888834496f1612ae80aa95306ff5f
Component: engine
2015-12-14 23:05:29 +01:00
f0d94a9df5
Merge pull request #18643 from tianon/apt-get-clean
...
Remove mention of "apt-get clean" as it's performed automatically
Upstream-commit: a7e30a4ffba7989362537ebdc78d136fbcab59be
Component: engine
2015-12-14 22:54:17 +01:00
e47f560066
Remove httputils dependency from API client lib.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 83b5729f6452de6b40719b9485947eea0bd0eedd
Component: engine
2015-12-14 16:48:59 -05:00
19f8a4f8fb
Merge pull request #18486 from aboch/vnd
...
Vendoring libnetwork bbd6e6d8ca1e7c9b42f6f53277b0bde72847ff90
Upstream-commit: 260cbb19c93ba1dc5aa0f4065cd5c95241bbd59d
Component: engine
2015-12-14 13:32:01 -08:00
dde4bcd6f4
bash completion for docker daemon --authz-plugin
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 069fe81fa602e7d8af98e2b67b761a62526f014a
Component: engine
2015-12-14 13:25:45 -08:00
4b93eb25be
Merge pull request #18612 from mrunalp/update_runc
...
Update runc/libcontainer to v0.0.6
Upstream-commit: ecc3717cb17313186ee711e624b960b096a9334f
Component: engine
2015-12-14 13:05:53 -08:00
899c6bfe77
Remove mention of "apt-get clean" as it's performed automatically
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
Upstream-commit: 226329e54031256958740af0ae5bc1a4f2cd9c2e
Component: engine
2015-12-14 12:50:44 -08:00
a0ef20d025
Fix small missing equal sign for 'docker daemon --cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 4ba173630ad2b7a5fc59df280617a1bfa1dda323
Component: engine
2015-12-14 21:20:49 +01:00
0d312f9927
Add zsh completion for 'docker daemon --authz-plugin'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: 76844d786bea2e435d25f150044fa242206ce364
Component: engine
2015-12-14 21:16:54 +01:00
6e0f72dc84
Merge pull request #18637 from dnephin/move_auth_config
...
Move more api types to api/types package
Upstream-commit: 75d69ce0da2e360773736502acd92d4a9cf7faa5
Component: engine
2015-12-14 11:53:30 -08:00
7890f1c0f3
Merge pull request #18642 from tophj-ibm/add-z-unshare-image
...
Add unshare image to s390x Dockerfile
Upstream-commit: 0c2dd27581048102b5d8803f95e6bc58834842d7
Component: engine
2015-12-14 11:32:27 -08:00
7e7a8a6ffd
Remove timeout shared function.
...
Handle timeouts when it's necessary based on a Timeout interface.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 9dc7d07fc11163205985b7d56742a4f9b89d7e09
Component: engine
2015-12-14 14:24:21 -05:00
884e98d4cc
Merge pull request #18639 from calavera/force_api_version
...
Force API versioning in the client library.
Upstream-commit: 984282e28cf68e658112f199e8baa5f0931cc242
Component: engine
2015-12-14 11:20:12 -08:00
89d947a31f
Merge pull request #18570 from suihkulokki/control-fix
...
hack/make/.build-deb/control: add missing fields
Upstream-commit: 03e2923e42446dbb830c654d0eec323a0b4ef02a
Component: engine
2015-12-14 10:41:56 -08:00
df6285237c
Merge pull request #18372 from Microsoft/jjh/winci-ensurefrozen
...
Windows CI Fix: No subshell due to bash 3.x
Upstream-commit: b13fd10109db75996a31fd52393ef3410feee3ca
Component: engine
2015-12-14 10:32:53 -08:00
cc9801b915
Add unshare image to s390x Dockerfile
...
This adds unshare image to Dockerfile.s390x
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: 52e53814ea860919f8ddf2c82a6b24d41630072c
Component: engine
2015-12-14 12:16:18 -06:00
18aa0ef1ba
Merge pull request #18393 from qzio/apparmor/ptrace-ubuntu14
...
Enable ptrace in a container on apparmor below 2.9
Upstream-commit: c38aa60180792210a21f162a57958bda86f9c381
Component: engine
2015-12-14 10:07:01 -08:00
a55d187756
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 >
Upstream-commit: b679eb9a8263d2cb00fecc8741d62d2b35db5ac5
Component: engine
2015-12-14 12:06:42 -05:00
7f5dff04d0
Move IndexInfo and ServiceConfig types to api/types/registry/registry.go
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 96c10098ac32f700f37358e2adc36c94741772bb
Component: engine
2015-12-14 11:28:02 -05:00
f21c49a3d1
Merge pull request #18631 from tiborvass/cleanup-utils
...
Create `builder/dockerignore` and `pkg/gitutils` to clean up `utils`
Upstream-commit: 44299989b24507dad0bcd66fefcbc2a00e13665c
Component: engine
2015-12-14 17:22:01 +01:00
0d867da41c
Move AuthConfig to api/types
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com >
Upstream-commit: 5b321e328769cc93c3454e82ec3fe07672156f2e
Component: engine
2015-12-14 11:22:01 -05:00
c91a6d546b
Removing the restriction to push to a 'official' repo
...
Signed-off-by: toli <toli@docker.com >
Upstream-commit: 0d824c760ec2413f4df7855b9b6559424d01e556
Component: engine
2015-12-14 07:45:00 -08:00
07745f2aef
Merge pull request #18618 from dnephin/refactor_resolve_auth_config
...
Refactor ResolveAuthConfig to remove the builder dependency on cli code
Upstream-commit: 5e0283effa73223e5528c61beb4e05b5018c5d6b
Component: engine
2015-12-14 15:23:36 +01:00
1caa5bd099
utils: move dockerignore function to builder/dockerignore
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 63e3816c1dd449de63500a2b5fec9c2a33a0894c
Component: engine
2015-12-14 14:59:52 +01:00
86409751de
utils: move git functions to pkg/gitutils
...
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 135cca6f52c7862f13f50c30ccf5925038ba40a9
Component: engine
2015-12-14 14:59:52 +01:00
c145ea67c2
Merge pull request #18112 from daehyeok/fix_dry_run_test
...
Change TestRunNonRootUserResolvName Fail log.
Upstream-commit: f8bc4ed573e4bf6883d8888b8143ddfb7d31a1d7
Component: engine
2015-12-14 13:31:17 +01:00
99a16e1ac6
Merge pull request #18616 from calavera/move_client_version_to_docker_cli
...
Move client version to the docker cli.
Upstream-commit: 5fd9a8f6030558d90f4e1a3e55f6b0017d34d23f
Component: engine
2015-12-14 11:43:01 +01:00
df9b4bd431
Change TestRunNonRootUserResolvName Fail log.
...
Signed-off-by: Daehyeok Mun <daehyeok@gmail.com >
Upstream-commit: ba6b69adc2a790331701f021ac798ee23e059151
Component: engine
2015-12-13 19:59:51 -07:00
3c4fcf6b7a
Fix typos found across repository
...
Signed-off-by: Justas Brazauskas <brazauskasjustas@gmail.com >
Upstream-commit: 927b334ebfc786276a039e45ec097e71bf9a104c
Component: engine
2015-12-13 18:04:12 +02:00
7a127054c1
Merge pull request #18620 from jeffjohnston/DOC-16770
...
Update configuring Docker article
Upstream-commit: f5e6b09783b592c67631e77c43c81e996a3971c3
Component: engine
2015-12-13 14:10:46 +01:00
941029f664
update network settings on container creating
...
To make docker inspect return a consistent result of networksettings
for created container and stopped container, it's bettew to update
the network settings on container creating.
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: c427131c94369d5c49a4f14d78e6ab9c678e12df
Component: engine
2015-12-13 02:34:44 -05:00
22a82ca57b
Merge pull request #18389 from wenchma/doc_update_for_container-basics
...
docs: delete draft container-basics.md
Upstream-commit: 94026969b43fddee3fbf35e5888dee006a14e098
Component: engine
2015-12-12 21:39:34 -08:00
