239fd6e7ef
Merge pull request #16503 from carolfh/image-mag
...
Image mag
Upstream-commit: ec4b71b64a1307916ec9a0d17460077798390470
Component: engine
2015-09-23 12:43:20 -07:00
f079e61160
Merge pull request #16493 from cpuguy83/doc_plugin_rpcgen
...
Add README for pluginrpc-gen
Upstream-commit: 8f7f0f8deb95804eef95b572c53721ea1d0199d9
Component: engine
2015-09-23 15:36:05 -04:00
e2a6738cd5
fixed jira DTR-1173 typo in link and additional edits
...
Signed-off-by: Carol Fager-Higgins <carol.fager-higgins@docker.com >
Upstream-commit: 3e6991f35c6b98f3503cc81f166420645e7d3c9e
Component: engine
2015-09-23 12:33:45 -07:00
e4f6d7ad34
Merge pull request #16522 from jfrazelle/zypper-wtaf
...
fix zypper wrt interactive
Upstream-commit: 70016198ce84e545bd155627d179a8d65b7fb7f6
Component: engine
2015-09-23 10:30:58 -07:00
95826bd037
fix zypper BS wrt interactive
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com >
Upstream-commit: d265f93f6e9f6232b957592bba9a25fbc426a8c9
Component: engine
2015-09-23 04:48:06 -07:00
b761cfeb67
Add README for pluginrpc-gen
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 7acd3ca79d2b13500ca3f53a567cb87fddd4a543
Component: engine
2015-09-22 19:34:44 -04:00
26c6a8d526
Merge pull request #16328 from jfrazelle/opensuse-rpms
...
add opensuse to rpm builder
Upstream-commit: b0dc11127ef4fc20261ccc0db03a16b17f7f91c4
Component: engine
2015-09-22 15:59:49 -07:00
ef74ac9a73
Merge pull request #16492 from albers/completion-compopt-mac
...
[Fix 16348] Bash completion: avoid 'compopt: command not found' errors on Mac OS
Upstream-commit: 14e8949dcfdd2c553eb6c1f7ad0ee6e13bbda50d
Component: engine
2015-09-22 15:58:56 -07:00
6f56efa779
Merge pull request #16331 from calavera/server_middlewares
...
Organize server pre-func logic in middlewares.
Upstream-commit: 9dc0973655bba2250b906bc8b316d87af809a15e
Component: engine
2015-09-22 16:10:42 -05:00
aee0028193
Merge pull request #16312 from Microsoft/10662-startwindowscli
...
Windows: First part of CI tests (docker run)
Upstream-commit: 04d76d898addae4451db28999a230a0399f08b30
Component: engine
2015-09-22 15:37:33 -04:00
7e4c20cd08
Bash completion: avoid 'compopt: command not found' errors on Mac OS
...
The shell builtin `compopt` is not available on the outdated bash
version 3.2.57 that ships with Mac OS.
It is used in Docker's bash completion to suppress trailing spaces
in advanced completions of hash map options, e.g. `--log-opt`.
If `compopt` is not available, the new behavior is to do nothing,
i.e. the user will have to delete the additional space.
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9d8f9943e99b87aa637921bbf582a767cbab6cf1
Component: engine
2015-09-22 12:17:30 -07:00
fca7da0a8e
Merge pull request #16235 from HuKeping/oom-event
...
Events for OOM needs to be shift to an earlier time
Upstream-commit: 114612305c798735e7022274cc9db382f30aa174
Component: engine
2015-09-22 11:50:30 -07:00
5a36e78a10
Windows: First part of CI tests (docker run)
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 8a5ab83df8c029723d92a8b3a602b0d799753807
Component: engine
2015-09-22 10:24:03 -07:00
cca18b2305
Merge pull request #16428 from charleswhchan/fix-logs-doc
...
Touch up 'docker logs' documentation.
Upstream-commit: bfc785bf6409419cbedde4af3057ab921a5e17d8
Component: engine
2015-09-22 07:17:26 -07:00
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
3ddae4e8f1
Touch up 'docker logs' documentation.
...
* Update format for 'Note:' to match other pages.
* Add link to Go's RFC3339Nano timestamp information.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com >
Upstream-commit: eff524e19cb2cb6fcd6630e0aff7979e3507768c
Component: engine
2015-09-21 19:47:33 -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
651f1e747f
Organize server pre-func logic in middlewares.
...
It defines global middlewares for every request.
This makes the server slightly more composable.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 0fea04d27ee91d7b57e0a77b110db1c861768c74
Component: engine
2015-09-21 14:27:06 -04: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
99072d662d
Events for OOM needs to be shift to an earlier time
...
It's worth to warn user as soon as possilbe when OOM happend.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: f05bacbe509823e2ca65583f35188ca09d01db80
Component: engine
2015-09-21 10:18:08 +08: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
