64aea80dba
Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds
...
deprecate bind path auto-create
Upstream-commit: e61abac5fa1c1ce2330e34c8eb51d9592dde2dd3
Component: engine
2015-09-18 12:53:06 -07:00
f1ab116cf0
Merge pull request #16403 from runcom/fix-containers-json-emtpy-response
...
Fix GET /containers/json emtpy response regression
Upstream-commit: 96f9efc0636be5d89fd242e7a5aa96485b80ad01
Component: engine
2015-09-18 11:47:42 -07:00
cdae9e4a30
events/jsonmessage: add and prefer TimeNano for events
...
This way provide both Time and TimeNano in the event. For the display of
the JSONMessage, use either, but prefer TimeNano Proving only TimeNano
would break Subscribers that are using the `Time` field, so both are set
for backwards compatibility.
The events logging uses nano formatting, but only provides a Unix()
time, therefor ordering may get lost in the output. Example:
```
2015-09-15T14:18:51.000000000-04:00 ee46febd64ac629f7de9cd8bf58582e6f263d97ff46896adc5b508db804682da: (from busybox) resize
2015-09-15T14:18:51.000000000-04:00 a78c9149b1c0474502a117efaa814541926c2ae6ec3c76607e1c931b84c3a44b: (from busybox) resize
```
By having a field just for Nano time, when set, the marshalling back to
`time.Unix(sec int64, nsec int64)` has zeros exactly where it needs to.
This does not break any existing use of jsonmessage.JSONMessage, but now
allows for use of `UnixNano()` and get event formatting that has
distinguishable order. Example:
```
2015-09-15T15:37:23.810295632-04:00 6adcf8ed9f5f5ec059a915466cd1cde86a18b4a085fc3af405e9cc9fecbbbbaf: (from busybox) resize
2015-09-15T15:37:23.810412202-04:00 6b7c5bfdc3f902096f5a91e628f21bd4b56e32590c5b4b97044aafc005ddcb0d: (from busybox) resize
```
Including tests for TimeNano and updated event API reference doc.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 4026512a2c535fe377a4cf834b7a78fccfd82dab
Component: engine
2015-09-18 13:15:26 -04:00
a5c36fcdf5
Merge pull request #16389 from HuKeping/stats-zero
...
Reset data of stats in docker cli when container stopped
Upstream-commit: 41646cb4e318b025a5a5c627481e551c49f726e2
Component: engine
2015-09-18 18:59:51 +02:00
3afb789aff
Fix GET /containers/json emtpy response regression
...
GET /containers/json route used to reply with and empty array `[]` when no
containers where available. Daemon containers list refactor introduced
this bug by declaring an empty slice istead of initializing it as well
and it was now replying with `null`.
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 26bd5e3a2da3157f0bcb6654c30b6eccedf7f3f3
Component: engine
2015-09-18 18:44:46 +02:00
5fba122c28
Merge pull request #16260 from sunyuan3/comment
...
Correct wrong comment for TestRunWithoutMemoryswapLimit case.
Upstream-commit: 72eb75a06c8533ada2062454de4981c46db63fb7
Component: engine
2015-09-18 09:22:49 -07:00
08934e2807
Merge pull request #16378 from duglin/MoveErrors
...
Move api/errors/ to errors/
Upstream-commit: c4d4318b82f8246b908981504c7975ba3ed5dd3b
Component: engine
2015-09-18 10:42:12 -04:00
4e8ec3d151
deprecate bind path auto-create
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 249f45bcfe1adf4b3550306951f2768b17802217
Component: engine
2015-09-18 10:28:38 -04:00
5be2b08002
Reset data of stats in docker cli when container stopped
...
When use `docker stats` to minitor a running container and then stop it,
there are some fields need to be reset to zero. Otherwise it will keep
displaying the data it received last time.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: da67833e63f317d8f20ffed5c3250f442900bdae
Component: engine
2015-09-18 15:24:13 +08:00
0cc2676e92
Correct wrong comment for TestRunWithoutMemoryswapLimit case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: cf6a53642a0abdec9e2b2269d522a20e2a885f65
Component: engine
2015-09-18 08:28:36 +08:00
238b3791d0
Merge pull request #15327 from flavio/update-suse-docs
...
Update SUSE docs
Upstream-commit: d2e7ba42b10fda5961470adc4ba4d74011203e60
Component: engine
2015-09-17 16:46:26 -07:00
2a20dd0c76
Merge pull request #16377 from runcom/add-stats-tests
...
integration-cli: add cli/api stats tests when container not found
Upstream-commit: 52d7542195e301cb45be9b5ff210a39c975cde02
Component: engine
2015-09-17 13:43:02 -07:00
f0cc64a32d
Merge pull request #16364 from wcwxyz/master
...
Preserve /etc/sysconfig/docker across rpm update
Upstream-commit: 4a707c9ad9f5055a090e7402b2ab5e9ee145837f
Component: engine
2015-09-17 13:36:17 -07:00
3904dd3167
Move api/errors/ to errors/
...
Per @calavera's suggestion: https://github.com/docker/docker/pull/16355#issuecomment-141139220
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: a283a30fb026aad4434a9f2e34f7ce955d27a957
Component: engine
2015-09-17 11:54:14 -07:00
c5612022ae
Merge pull request #16271 from runcom/deprecate-cli-opts
...
Deprecate -c cli short variant flag in docker run
Upstream-commit: 4702d45599bf69b525a58c804d175732b934591e
Component: engine
2015-09-17 11:52:59 -07:00
ebaf24310f
Merge pull request #16354 from tomdee/patch-3
...
Update the instructions for building experimental docker binaries
Upstream-commit: 96c735a72405a3a8d479b50ec25f91bd72923aa2
Component: engine
2015-09-17 11:50:07 -07:00
2d5e18cda2
Merge pull request #16355 from duglin/DaemonErrors
...
Convert some "daemon" static error strings to the new errocode package format
Upstream-commit: 828e4ac45a5b4954997949570b9b032c57137849
Component: engine
2015-09-17 11:48:37 -07:00
61d5ad0174
Merge pull request #16375 from sunyuan3/makefile
...
from make file to Makefile
Upstream-commit: 57c6012cf0dbe1097b2b876b0fbca5fa6dbf0e81
Component: engine
2015-09-17 10:10:18 -07:00
e0ab2a79d7
integration-cli: add cli/api stats tests when container not found
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: 66be81b148a1c6693c44cf52d8172d512eedc233
Component: engine
2015-09-17 18:20:25 +02:00
0203472d5b
Merge pull request #15898 from Microsoft/15775-buildcontextfix
...
Windows: Fix long path handling for docker build
Upstream-commit: cfd3080a8004738c34ecf1ae0e6cd2f82638c78b
Component: engine
2015-09-17 09:19:23 -07:00
3794bfe695
from make file to Makefile
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 5e7895ee2159552ddd65a91f38bd87a1999328a0
Component: engine
2015-09-17 15:37:50 +00:00
3d67e39b1a
Merge pull request #16370 from mountkin/daemon-cleanup
...
remove the unused run() and output() functions in daemon/container.go
Upstream-commit: e33b8b11afd9d2b830ffed11f3c70e7448be1ff4
Component: engine
2015-09-17 17:33:55 +02:00
d13159ba93
Merge pull request #16361 from MHBauer/stats-refactor
...
refactor stats to not use internal data structures
Upstream-commit: cafee2eb4544442cd1307c1484235261b5b2752a
Component: engine
2015-09-17 08:28:07 -07:00
0351ae3d97
Deprecate -c cli short variant flag in docker run
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: e5a26ec0814eebca59ecde38b1aaa5a7de4013fb
Component: engine
2015-09-17 15:48:48 +02:00
82cf13a7d1
Skip racey TestDockerCmdInDirWithTimeout
...
Signed-off-by: Antonio Murdaca <runcom@linux.com >
Upstream-commit: f1728472059212001450a990468e8c2c6d7e38c9
Component: engine
2015-09-17 15:30:07 +02:00
d6c0223ae2
remove the unused run() and output() functions in daemon/container.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com >
Upstream-commit: b79782e9516188e4c6e0d2e20d4a42d91f1c0c3c
Component: engine
2015-09-17 19:22:25 +08:00
b0bf51095d
Merge pull request #16336 from mountkin/fix-hijack
...
error should be checked earlier in the hijack function
Upstream-commit: ffaee8fe78a5e7203b28895788e2aa16b4315b21
Component: engine
2015-09-17 09:38:48 +02:00
e6ff3f627c
Preserve /etc/sysconfig/docker across rpm update
...
Otherwise we have to reconfigure every time docker rpm got update.
Signed-off-by: WANG Chao <wcwxyz@gmail.com >
Upstream-commit: b51918fba18999d415cdc555616cc3076db01842
Component: engine
2015-09-17 12:12:28 +08:00
ee9bd9e809
Merge pull request #15182 from mapuri/build-arg
...
Support for passing build-time variables in build context
Upstream-commit: 1ffff4c8e2b208664b6f63ea6cd3c4c3dace3cc9
Component: engine
2015-09-16 23:52:37 -04:00
c2bb8dcb02
Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
...
log driver - Interpolate fields into log tag
Upstream-commit: 4dfa996cc246691de5e6f509939b96e8643ac228
Component: engine
2015-09-16 23:33:34 -04:00
b23ea59e6d
refactor stats to not use internal data structures
...
- refactor to make it easier to split the api in the future
- addition to check the existing test case and make sure it contains
some expected output
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 2d5d606fd368814ead4ff189eeae264f2af8691b
Component: engine
2015-09-16 17:28:52 -07:00
2f2b741d7b
Merge pull request #16357 from Microsoft/10662-enabledockervolume
...
Windows: Enable docker volume
Upstream-commit: b0b3bc56d05ea1de7d5510dd00bb1cb63ac0b0c7
Component: engine
2015-09-16 16:42:50 -07:00
6295202aba
Convert some "daemon" static error strings to the new errocode package format
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: f7d4b4fe2b130a522dee847a657218806180fa52
Component: engine
2015-09-16 16:16:42 -07:00
1f509b7064
Merge pull request #16358 from mrjana/mh
...
Vendoring libnetwork
Upstream-commit: 9ab8c2d92eae410ca765ddda4da4dab236f23153
Component: engine
2015-09-16 15:47:47 -07:00
3cfc4f37fa
Merge pull request #16294 from jfrazelle/cleanup-vendor
...
cleanup vendoring of test deps
Upstream-commit: 0ac28f5e4858ae47a4f452959c722375e587e12f
Component: engine
2015-09-16 15:45:36 -07:00
6e1d19dd58
Merge pull request #16359 from cpuguy83/skip_racey_test
...
Skip racey TestDockerCmdWithTimeout
Upstream-commit: 9a8f1b767314cd61a4f213906a89df319b7736c3
Component: engine
2015-09-16 18:37:14 -04:00
7d7547b76d
Skip racey TestDockerCmdWithTimeout
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 5cf3a6e01049c6557645e45732c1a04860f1c327
Component: engine
2015-09-16 18:36:35 -04:00
be5aed80c9
Merge pull request #16269 from moxiegirl/fixes-15790
...
Clarifying use of flag
Upstream-commit: 3394fedf3282aedb16c6f3576e0aec721e7e8286
Component: engine
2015-09-17 00:23:25 +02:00
bd692d4b30
log driver - add ability to interpolate container context into the log tag field
...
Signed-off-by: Philip Monroe <phil@philmonroe.com >
Upstream-commit: 3be7146e14d1f5ced470c0c7e3066f091f468696
Component: engine
2015-09-16 15:19:28 -07:00
af40a9a21d
Merge pull request #16031 from thockin/14069-dns-options
...
Add support for DNS options
Upstream-commit: 5cbcbfc03cc11de8d58dd0977327bb6a8cfc9fa4
Component: engine
2015-09-16 23:59:19 +02:00
dbdbf2ae59
Vendoring libnetwork
...
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18
Signed-off-by: Jana Radhakrishnan <mrjana@docker.com >
Upstream-commit: a803148bbac87aec183be38502991bb779196560
Component: engine
2015-09-16 14:48:42 -07:00
10a1fde8b9
Merge pull request #16261 from vdemeester/integration-dockercmd
...
Move dockerCmd to pkg/integration and add tests to it
Upstream-commit: 677a6eaf8f33360e87fb915e632a5d0e8e380dbd
Component: engine
2015-09-16 17:40:33 -04:00
9f76426e0b
Windows: Enabled docker volume
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 42a46ed1a4cd1a6116b3bc5018c29c80db93f928
Component: engine
2015-09-16 14:33:13 -07:00
e7573766cd
Merge pull request #16351 from mavenugo/vin_ln_kv
...
Vendoring in libnetwork and libkv
Upstream-commit: 4a2c3733bd904919c17fbf007361093d87609686
Component: engine
2015-09-16 14:10:49 -07:00
655513db24
Add support for DNS options
...
Signed-off-by: Tim Hockin <thockin@google.com >
Upstream-commit: 3d4685e258a7729bd0f8cc411b5a73980a9faa20
Component: engine
2015-09-16 14:06:45 -07:00
9ef3eefa22
Merge pull request #16316 from vbatts/vbatts-events
...
daemon/events: let Log be [slightly] blocking
Upstream-commit: b9a3660d1e007a38585e0bb769169ea0911c0e18
Component: engine
2015-09-16 13:57:06 -07:00
72a3863e6b
Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test
...
Skip TestRunDeviceDirectory when no /dev/snd
Upstream-commit: fb01c2ea3cbc723d4f6950f8d004bbc064acd1f3
Component: engine
2015-09-16 13:56:11 -07:00
a067d73ef6
Merge pull request #16305 from estesp/hooks-for-the-hooks-gods
...
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
Upstream-commit: ac34ce0307aeeeba715e16d3cac8e5a7a07a6e1e
Component: engine
2015-09-16 13:55:16 -07:00
7077353720
Merge pull request #16308 from runcom/graph-unparam
...
graph: remove unused functions parameters
Upstream-commit: 5b99591e18d71085619122fc43d8920548b0e6b6
Component: engine
2015-09-16 13:54:23 -07:00
ad5e2fda43
Merge pull request #16345 from albers/completion-extglob-fix
...
[Fix 16326] Bash completion syntax error on OSX
Upstream-commit: c1e59b94e2de1f6380dce451886185117bbde06f
Component: engine
2015-09-16 13:43:02 -07:00
