Commit Graph

17163 Commits

Author SHA1 Message Date
dc3a94b8fc Merge pull request #16444 from fgimenez/11584-pkg-stdcopy-test-coverage
Added tests for Write
Upstream-commit: 44f47903a831e8031edb30fef2a9c6078234ee67
Component: engine
2015-09-22 14:28:14 +02:00
e0aff7f6e3 Added tests for StdWriter.Write.
The tests added cover the case when the Writer field returns and error
and, related to that, when the number of written bytes is less than 0.

Signed-off-by: Federico Gimenez <fgimenez@coit.es>
Upstream-commit: 3efe5ff22e7bf3264f653c7f7772c64771210afe
Component: engine
2015-09-22 09:05:22 +02:00
f5dba44987 Merge pull request #15864 from dmcgowan/notary-offline
Support content trust offline
Upstream-commit: a7e23cab8d10003914e39f1c954278c7be6bd759
Component: engine
2015-09-21 21:11:36 -07:00
a91e1506bf Merge pull request #16419 from HuKeping/comments
Comment: add description for some code which hard to understand
Upstream-commit: f97e6f2a374b85c5ef14b19b805991d98a7f3d27
Component: engine
2015-09-21 20:44:54 -07:00
fc5d97018d Comment: add description for some code which hard to understand
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 3b443abec254cb8214881e11af4c09e923cd2dd1
Component: engine
2015-09-22 09:34:49 +08:00
dbbb1621a8 Merge pull request #16400 from albers/completion-log-opt-tags
bash completion: use generic `tag` log driver option
Upstream-commit: 108891069f60a535ca6397b388145bd188dc8263
Component: engine
2015-09-21 17:17:11 -07:00
511d6df253 Merge pull request #16457 from Microsoft/10662-blockarg
Windows: Nice error on ARG (builder)
Upstream-commit: 5c73f14c62127d136cfeec21a7f0f1c84dbf1f2c
Component: engine
2015-09-21 19:43:48 -04:00
295c5cdefd Windows: Nice error on ARG (builder)
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: b69c13b1a643911a541c251b22b4a440197e5f7d
Component: engine
2015-09-21 14:54:15 -07:00
36e8a28c25 Merge pull request #16465 from albers/reference-capability-all
reference: capability `all` should be `ALL`
Upstream-commit: 985b7ec895e75337056e8db1d7fa28e15c0b8180
Component: engine
2015-09-21 16:49:17 -04:00
74eb321129 Merge pull request #16461 from tomdee/libnetwork-routes-fixes
Vendoring libnetwork
Upstream-commit: a8eba11fb111276e7e8917b701de2361aad07eb2
Component: engine
2015-09-21 16:48:16 -04:00
d787275160 Merge pull request #16466 from runcom/15876-fix-TestRunWithKernelMemory
daemon: execdriver: lxc: fix wrong template value passed to lxc conf
Upstream-commit: da82b5fedbc4763424e305d330cf7c31f896fed3
Component: engine
2015-09-21 16:34:34 -04:00
f1430df5ab Merge pull request #16404 from duglin/FixRenameError
Fix 'rename' error msg and error checking
Upstream-commit: 0c71c192395e259d76a51e08c7c3bd73eb6f16e7
Component: engine
2015-09-21 15:51:02 -04:00
1598efd7a1 Merge pull request #16413 from sunyuan3/TestRunSwapMoreThanMemoryLimit
Add the TestRunSwapMoreThanMemoryLimit case.
Upstream-commit: 732676fad53bec21b332d1430d102502c4c4e737
Component: engine
2015-09-21 15:43:20 -04:00
fd7f03427f daemon: execdriver: lxc: fix wrong template value passed to lxc conf
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 7b4f73ee6c2a06532124e77ec5f4972f078a7d5c
Component: engine
2015-09-21 21:40:46 +02:00
78209a9e2f Merge pull request #16432 from calavera/volume_store
Move volume ref counting store to a package.
Upstream-commit: 2daa5b17353ad0700013641cf7dfc091cbd02c6e
Component: engine
2015-09-21 15:38:06 -04:00
022c1e60a2 reference: capability all should be ALL
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: d37674b44b4b843dcdd2626b58645d9ffef2cb6e
Component: engine
2015-09-21 21:09:50 +02:00
7a04c92cc8 Merge pull request #16437 from runcom/invalid-logger-address
daemon: logger: error out on daemon start if invalid logger address
Upstream-commit: d572bab4a09eb7d60961867d2d2f9896595a3271
Component: engine
2015-09-21 14:53:47 -04:00
a3f8f51f2a Merge pull request #15029 from azurezk/add-version-info
Add docker version info in /info request
Upstream-commit: 40edb5f97c3ba95e450c8280b29d0ef027b51cfb
Component: engine
2015-09-21 11:44:11 -07:00
7583ab4278 Vendoring libnetwork
Pull in version e5fea92a6c8a5968bdb8005bf959c6e23113b689

Fixes libnetwork regressions that stopped drivers that set routes from working.
Pulls in libnetwork PRs #546 #543

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
Upstream-commit: 499ade011685732728c9fd1ee2d7d5fe4a9a6a76
Component: engine
2015-09-21 11:13:14 -07:00
c8b313872b Merge pull request #16449 from runcom/add-container-label-userguide
docs: userguide: add container labels section
Upstream-commit: f018c0430bd9a2c8dfe415aeb11e0ede2b435773
Component: engine
2015-09-21 10:26:20 -07:00
5a458f78ee Move volume ref counting store to a package.
- Add unit tests to make sure the functionality is correct.
- Add FilterByDriver to allow filtering volumes by driver, for future
  `volume ls` filtering and whatnot.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 72bb56618b522fc3cece7cfd706c56296824673d
Component: engine
2015-09-21 12:46:49 -04:00
7fa0a79ba9 Merge pull request #16440 from runcom/tempdir-check-errs
integration-cli: check err on tmp dir creation
Upstream-commit: 587558f617e602c0a690c751d96ccddea3f648d3
Component: engine
2015-09-21 08:06:08 -07:00
6c9902c2db Add the TestRunSwapLessThanMemoryLimit case.
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: ab39a4c98110d9a16afd73ce2992ab3d4532201a
Component: engine
2015-09-21 22:12:19 +08:00
8e71940329 add docker server version to /info
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: 7cf343d1064e3d8211597c67574ff4ddff316fa1
Component: engine
2015-09-21 21:15:32 +08:00
d006ffc2e0 Merge pull request #16443 from coolljt0725/simplify_volume_code
Cleanup: remove unnecessary return at the end of block in volume.go
Upstream-commit: 743dc1c791e5a78c881180fdad2fc3be19ad7c8d
Component: engine
2015-09-21 09:05:16 -04:00
361e22d91a docs: userguide: add container labels section
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 124540c08603f1eda956f16e2eef2f42d3b3e80f
Component: engine
2015-09-21 14:41:22 +02:00
7f1e77e56a Cleanup: remove unnecessary return at the end of block in volumes.go
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 5746eb950130793a1833860b7bc03c2c8fa7b46f
Component: engine
2015-09-21 04:32:37 -04:00
d572cd9e37 Merge pull request #16174 from sallyom/man-restart-fix
docker restarts running OR stopped containers
Upstream-commit: 4a6e8c8f3c8d129bb06922a0d8e1e1276c254f66
Component: engine
2015-09-20 18:10:06 -07:00
7020653250 api: server: container: fix wrong comment
This comment was wrongly referring to the old job mechanism and it
wasn't clear what it was trying to document.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: 76b3b5431475709b27f0c113f9319321388a49d1
Component: engine
2015-09-21 00:46:16 +02:00
82a956ef62 integration-cli: check err on tmp dir creation
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: b616b8a17a9f61881c83c2324399856e466a0805
Component: engine
2015-09-21 00:00:55 +02:00
fe1da9c698 Merge pull request #16425 from charleswhchan/fix-version-doc
Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Upstream-commit: 4133401bf992826e4923d0734e4f09c4c7f68882
Component: engine
2015-09-20 14:33:47 -07:00
72ffa04366 daemon: logger: error out on daemon start if invalid logger address
If an invalid logger address is provided on daemon start it will
silently fail. As syslog driver is doing, this check should be done on
daemon start and prevent it from starting even in other drivers.
This patch also adds integration tests for this behavior.

Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: e3c472426ff1dccf083e41dbbfdf5935921bf330
Component: engine
2015-09-20 16:20:25 +02:00
4168ba7ed4 docker restarts running OR stopped containers, docs edit rm "running"
Signed-off-by: Sally O'Malley <somalley@redhat.com>
Upstream-commit: e41753678d5ffd6c505f1984943bc36d34e134bb
Component: engine
2015-09-20 09:16:27 -04:00
b3b1f3bcbe Merge pull request #16430 from runcom/pkg-integration-fix-format
pkg: integration: utils_test: fix int format
Upstream-commit: 148be8bd7efd2cdb74b0cd9466fccb57c4c51834
Component: engine
2015-09-20 06:48:58 -05:00
c2899cc7c9 pkg: integration: utils_test: fix int format
Signed-off-by: Antonio Murdaca <runcom@linux.com>
Upstream-commit: c219311fd89b21aecc44895e3177ea3fc5b973d6
Component: engine
2015-09-20 02:42:08 +02:00
17451ec748 Merge pull request #16414 from sunyuan3/dockertest
Add timeout description.
Upstream-commit: acdc0f82c03133ddddd36ec8b12ef13b68035eda
Component: engine
2015-09-19 22:20:10 +02:00
ca451265c5 Add missing '[OPTIONS]' arg to documentation for 'docker version'.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
Upstream-commit: 8d6796f8c63ae09ce35a56525a947ae1aa887b0b
Component: engine
2015-09-19 08:53:11 -07:00
16952d5c9b Merge pull request #16363 from coolljt0725/fix_net_none_test
Fix --net none test closes #16356
Upstream-commit: 7d5603e7cbc8799789b356adf354c1859e4974e7
Component: engine
2015-09-19 09:25:12 -04:00
282912af5d Add timeout description.
It is almost impossible to take serveral minutes to complete all the
test.

Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
Upstream-commit: 76c96da4878a8b4ca6f5c9628448fa04401a32ec
Component: engine
2015-09-19 10:24:16 +08:00
fde5729def Fix --net none test closes #16356
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 0b2091132a6db1a9887626e1e85ca644c50dcbb4
Component: engine
2015-09-18 20:49:36 -04:00
a31daab9bb Merge pull request #16409 from runcom/fix-tests
integration-cli: fix tests with memory limit
Upstream-commit: 536353e87f83ca9869139a16aa80f6140fc504d4
Component: engine
2015-09-18 19:47:16 -04:00
be9c8b7551 Merge pull request #16405 from michaelhuettermann/master
Adding another scientist to the hall of fame.
Upstream-commit: bf892efe3658446b1b1b749043de4943556591ad
Component: engine
2015-09-18 16:09:01 -07:00
f242555aaa 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>
Upstream-commit: 0b8b8ed9e98a7355661f1aad93bfa0dd76362723
Component: engine
2015-09-19 00:07:40 +02:00
af83f1caed Windows: Fix warning on info
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 8d56108ffb4e334600377c4bb4471eecec7b825c
Component: engine
2015-09-18 13:39:12 -07:00
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
5b887ca863 Adding another scientist to the hall of fame.
Signed-off-by: Michael Hüttermann <michael@huettermann.net>
Upstream-commit: 3e212eec5ea6018d4a001574748df0ce9e0f3e32
Component: engine
2015-09-18 21:31:12 +02: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
3a09d2b95a Fix 'rename' error msg and error checking
`docker rename foo ''` would result in:
```
usage: docker rename OLD_NAME NEW_NAME
```
which is the old engine's way of return errors - yes that's in the
daemon code.  So I fixed that error msg to just be normal.

While doing that I noticed that using an empty string for the
source container name failed but didn't print any error message at all.
This is because we would generate a URL like: ../containers//rename/..
which would cause a 301 redirect to ../containers/rename/..
however the CLI code doesn't actually deal with 301's - it just ignores
them and returns back to the CLI code/caller.

Rather than changing the CLI to deal with 3xx error codes, which would
probably be a good thing to do in a follow-on PR, for this immediate
issue I just added a cli-side check for empty strings for both old and
new names. This way we catch it even before we hit the daemon.

API callers will get a 404, assuming they follow the 301, for the
case of the src being empty, and the new error msg when the destination
is empty - so we should be good now.

Add tests for both cases too.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 848792c42e61070adc4107a39d6a044e2ed615f7
Component: engine
2015-09-18 11:12:22 -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