4a6e8c8f3c
Merge pull request #16174 from sallyom/man-restart-fix
...
docker restarts running OR stopped containers
2015-09-20 18:10:06 -07:00
4133401bf9
Merge pull request #16425 from charleswhchan/fix-version-doc
...
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
2015-09-20 14:33:47 -07:00
e41753678d
docker restarts running OR stopped containers, docs edit rm "running"
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-09-20 09:16:27 -04:00
148be8bd7e
Merge pull request #16430 from runcom/pkg-integration-fix-format
...
pkg: integration: utils_test: fix int format
2015-09-20 06:48:58 -05:00
c219311fd8
pkg: integration: utils_test: fix int format
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-20 02:42:08 +02:00
acdc0f82c0
Merge pull request #16414 from sunyuan3/dockertest
...
Add timeout description.
2015-09-19 22:20:10 +02:00
8d6796f8c6
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
...
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-19 08:53:11 -07:00
7d5603e7cb
Merge pull request #16363 from coolljt0725/fix_net_none_test
...
Fix --net none test closes #16356
2015-09-19 09:25:12 -04:00
76c96da487
Add timeout description.
...
It is almost impossible to take serveral minutes to complete all the
test.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-19 10:24:16 +08:00
0b2091132a
Fix --net none test closes #16356
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-18 20:49:36 -04:00
536353e87f
Merge pull request #16409 from runcom/fix-tests
...
integration-cli: fix tests with memory limit
2015-09-18 19:47:16 -04:00
bf892efe36
Merge pull request #16405 from michaelhuettermann/master
...
Adding another scientist to the hall of fame.
2015-09-18 16:09:01 -07:00
16f60347bc
Merge pull request #16407 from Microsoft/10662-fixinfoprocerror
...
Windows: Fix error in daemon log on info
2015-09-18 16:08:45 -07:00
0b8b8ed9e9
integration-cli: fix tests with memory limit
...
If you don't have cgroup swap memory support, `dockerCmd`'s output in
these tests will be polluted by a warning from the daemon and will fail
the tests.
No need to have memory swap support for these tests to run as it will
be reset to -1 and everything will continue correctly.
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-19 00:07:40 +02:00
8d56108ffb
Windows: Fix warning on info
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-18 13:39:12 -07:00
e61abac5fa
Merge pull request #16349 from cpuguy83/16302_deprecate_autocreate_binds
...
deprecate bind path auto-create
2015-09-18 12:53:06 -07:00
3e212eec5e
Adding another scientist to the hall of fame.
...
Signed-off-by: Michael Hüttermann <michael@huettermann.net>
2015-09-18 21:31:12 +02:00
96f9efc063
Merge pull request #16403 from runcom/fix-containers-json-emtpy-response
...
Fix GET /containers/json emtpy response regression
2015-09-18 11:47:42 -07:00
45d7acf237
Merge pull request #16317 from vbatts/vbatts-event-timenano
...
jsonmessage: add and use TimeNano for events
2015-09-18 14:41:45 -04:00
4026512a2c
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>
2015-09-18 13:15:26 -04:00
41646cb4e3
Merge pull request #16389 from HuKeping/stats-zero
...
Reset data of stats in docker cli when container stopped
2015-09-18 18:59:51 +02:00
26bd5e3a2d
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>
2015-09-18 18:44:46 +02:00
72eb75a06c
Merge pull request #16260 from sunyuan3/comment
...
Correct wrong comment for TestRunWithoutMemoryswapLimit case.
2015-09-18 09:22:49 -07:00
c4d4318b82
Merge pull request #16378 from duglin/MoveErrors
...
Move api/errors/ to errors/
2015-09-18 10:42:12 -04:00
249f45bcfe
deprecate bind path auto-create
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-18 10:28:38 -04:00
da67833e63
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>
2015-09-18 15:24:13 +08:00
cf6a53642a
Correct wrong comment for TestRunWithoutMemoryswapLimit case.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-18 08:28:36 +08:00
d2e7ba42b1
Merge pull request #15327 from flavio/update-suse-docs
...
Update SUSE docs
2015-09-17 16:46:26 -07:00
52d7542195
Merge pull request #16377 from runcom/add-stats-tests
...
integration-cli: add cli/api stats tests when container not found
2015-09-17 13:43:02 -07:00
4a707c9ad9
Merge pull request #16364 from wcwxyz/master
...
Preserve /etc/sysconfig/docker across rpm update
2015-09-17 13:36:17 -07:00
a283a30fb0
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>
2015-09-17 11:54:14 -07:00
4702d45599
Merge pull request #16271 from runcom/deprecate-cli-opts
...
Deprecate -c cli short variant flag in docker run
2015-09-17 11:52:59 -07:00
96c735a724
Merge pull request #16354 from tomdee/patch-3
...
Update the instructions for building experimental docker binaries
2015-09-17 11:50:07 -07:00
828e4ac45a
Merge pull request #16355 from duglin/DaemonErrors
...
Convert some "daemon" static error strings to the new errocode package format
2015-09-17 11:48:37 -07:00
57c6012cf0
Merge pull request #16375 from sunyuan3/makefile
...
from make file to Makefile
2015-09-17 10:10:18 -07:00
66be81b148
integration-cli: add cli/api stats tests when container not found
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 18:20:25 +02:00
cfd3080a80
Merge pull request #15898 from Microsoft/15775-buildcontextfix
...
Windows: Fix long path handling for docker build
2015-09-17 09:19:23 -07:00
5e7895ee21
from make file to Makefile
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-17 15:37:50 +00:00
e33b8b11af
Merge pull request #16370 from mountkin/daemon-cleanup
...
remove the unused run() and output() functions in daemon/container.go
2015-09-17 17:33:55 +02:00
cafee2eb45
Merge pull request #16361 from MHBauer/stats-refactor
...
refactor stats to not use internal data structures
2015-09-17 08:28:07 -07:00
e5a26ec081
Deprecate -c cli short variant flag in docker run
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 15:48:48 +02:00
3b168b29f2
Merge pull request #16372 from runcom/skip-racey-twst
...
Skip racey TestDockerCmdInDirWithTimeout
2015-09-17 09:47:08 -04:00
f172847205
Skip racey TestDockerCmdInDirWithTimeout
...
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-17 15:30:07 +02:00
b79782e951
remove the unused run() and output() functions in daemon/container.go
...
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
2015-09-17 19:22:25 +08:00
ffaee8fe78
Merge pull request #16336 from mountkin/fix-hijack
...
error should be checked earlier in the hijack function
2015-09-17 09:38:48 +02:00
b51918fba1
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>
2015-09-17 12:12:28 +08:00
1ffff4c8e2
Merge pull request #15182 from mapuri/build-arg
...
Support for passing build-time variables in build context
2015-09-16 23:52:37 -04:00
4dfa996cc2
Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag
...
log driver - Interpolate fields into log tag
2015-09-16 23:33:34 -04:00
2d5d606fd3
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>
2015-09-16 17:28:52 -07:00
b0b3bc56d0
Merge pull request #16357 from Microsoft/10662-enabledockervolume
...
Windows: Enable docker volume
2015-09-16 16:42:50 -07:00
David Calavera
moxiegirl
Sally O'Malley
Doug Davis
Antonio Murdaca
Sebastiaan van Stijn
Charles Chan
Brian Goff
Yuan Sun
Lei Jitang
Jess Frazelle
John Howard
michaelhuettermann
Alexandre Beslic
Vincent Batts
Antonio Murdaca
Phil Estes
Hu Keping
Doug Davis
Shijiang Wei
WANG Chao
Tibor Vass
Morgan Bauer