b5fd27f53c
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d630abbab734d60cc3078fd1e94862a67e0d8fd
Component: engine
2015-09-24 09:37:07 -07:00
3a638e5279
Merge pull request #16190 from LK4D4/drain_refactor
...
Refactoring of bufReader
Upstream-commit: 8c33c6c737c887f05c0dfc1eb7f1002d16250f69
Component: engine
2015-09-24 01:54:40 -07:00
faecb581fa
Merge pull request #15021 from chenchun/resize_pool
...
Try to resize data and metadata loopback file when initiating devicemapper
Upstream-commit: 22877e1b165337a84629f5e513f69007e01a9c8e
Component: engine
2015-09-23 22:22:51 -04:00
87c29288c8
Try to resize data and metadata loopback file when initiating devicemapper
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: 2458452a3b96d0e6f6dfa44d7c30585db83c2fd1
Component: engine
2015-09-24 09:31:00 +08:00
8316b128fe
Merge pull request #16411 from duglin/DaemonErrors
...
Move more 'daemon' errors to the new error package
Upstream-commit: ebe7ef9fc2238f008101f31c0c405cbc460ab757
Component: engine
2015-09-23 21:20:56 -04:00
4422b77499
Merge pull request #16415 from HuKeping/dockerinfo
...
Format output of docker info
Upstream-commit: 40e856041265d6030768286f1b228f042c0f768b
Component: engine
2015-09-23 21:15:23 -04:00
6f6bded2f0
Merge pull request #16540 from MHBauer/man-build-arg
...
fix typo in man page
Upstream-commit: a51861226058299e0e504f5b512f0f9e2b4c6fb3
Component: engine
2015-09-23 17:51:09 -07:00
4662d89886
fix typo in man page
...
- resolve #16536
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 3a4775cb8003324d9aed5bfbe23f58eb0ca5bb41
Component: engine
2015-09-23 17:41:52 -07:00
be78ccc6cf
Make bytesPipe use linear allocations
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: c5b23337c37f0bcf01a7bf6a5129c326df136396
Component: engine
2015-09-23 17:12:54 -07:00
1547f964d2
Merge pull request #16497 from MHBauer/attach-refactor-new
...
refactor attach to not use internal data structures
Upstream-commit: ddd0c47412dd30f1d333b5bd53e22c9949d1e86f
Component: engine
2015-09-23 16:52:39 -07:00
9890a83a8f
Merge pull request #16484 from HuKeping/history-format
...
Format the output of docker history
Upstream-commit: d71ae4577293e6600447433126f4034d80d85ddb
Component: engine
2015-09-23 16:52:21 -07:00
a59918e10b
Merge pull request #16494 from calavera/fix_plugin_url_scheme
...
Do not hardcode http as plugin URL scheme for secure connections.
Upstream-commit: a1573dffee45b8205ee589cbb0ed01e476eed529
Component: engine
2015-09-23 16:18:00 -07:00
86820306dc
Merge pull request #16504 from brahmaroutu/ImageErrors
...
Adding error codes to image package
Upstream-commit: 793a40908155c87435e676646a23a413616dda6d
Component: engine
2015-09-23 19:15:25 -04:00
f73d781736
Refactor bufReader to use BytesPipe
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 56b70bf84e253bfedef94248a0b6b1f8d730091c
Component: engine
2015-09-23 16:00:28 -07:00
1c8652eb77
Add BytesPipe datastructure to ioutils
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 24310b5b4ab600ab5cb046d2f2ceaaa086b30be3
Component: engine
2015-09-23 16:00:27 -07:00
abf8c0902a
Merge pull request #16517 from coolljt0725/show_help_all_the_time
...
Clean up: show usage when global --help present
Upstream-commit: 01670bec48e3302c3571e7369e57fa0f092bbdf2
Component: engine
2015-09-23 18:58:19 -04:00
74d32ea342
Merge pull request #16371 from coolljt0725/docs_update_contributing
...
Docs: update the CONTRIBUTING.md
Upstream-commit: 323c77e4e18b7e5aefe0dbc5b44d913dee057011
Component: engine
2015-09-23 15:56:13 -07:00
845a2f5351
Merge pull request #16500 from sergeyevstifeev/11584-pkg-stdcopy-test-coverage
...
Adding some more coverage to StdCopy to address #11584
Upstream-commit: 04b171a6328d20ad4d6cbe1554aa53f189634178
Component: engine
2015-09-23 15:51:21 -07:00
132d2c125d
Merge pull request #16502 from Microsoft/10662-cpuweight
...
Windows: [TP4] Add CPU Weight
Upstream-commit: 51fad49e673900fd6c10d86e6a21dfc2f3f0b40f
Component: engine
2015-09-23 15:41:35 -07:00
24584ca8a3
Merge pull request #16523 from coolljt0725/correct_help_message_of_docker_cp
...
Docs: correct the description of docker cp
Upstream-commit: a077c46d140ade9b78d81c66fe4b752e6ea25f13
Component: engine
2015-09-23 15:40:58 -07:00
d8d1fffffc
Merge pull request #16528 from gesellix/docs-container-commit
...
fix content-type of response for `/commit`
Upstream-commit: 40adb3fd2cd6a10faa44bbd49a9364e2d71cefe9
Component: engine
2015-09-23 15:38:38 -07:00
4429613429
Merge pull request #16289 from cpuguy83/11957_fix_stdin_block_after_container_exit
...
Ensure stdin does not block after container stop
Upstream-commit: c0c941627a2a516ce540aac2d9e3d579baa3efde
Component: engine
2015-09-23 15:29:48 -07:00
a5a5293d43
Merge pull request #16346 from cpswan/fixes-15792
...
Clarify when keys are created
Upstream-commit: 871daf5498b4211a23ca5150444ed713d8cfd1d7
Component: engine
2015-09-23 15:29:06 -07:00
2ec677ecb1
Merge pull request #16518 from unclejack/bump_go_to_1.4.3
...
Dockerfile: bump Go to 1.4.3
Upstream-commit: 200fa6978c7e529ba837ee81e2cd1c926ead0966
Component: engine
2015-09-23 15:21:06 -07:00
a505c19468
fix content-type of response for /commit
...
Signed-off-by: Tobias Gesellchen <tobias@gesellix.de >
Upstream-commit: 78de066a28c5e01524401840ff4d1ae76e8e0fc2
Component: engine
2015-09-23 23:49:16 +02:00
72d0228543
Merge pull request #15915 from sdurrheimer/master
...
Zsh completion updates
Upstream-commit: 8d69e0eae06a741c8887af12d09461e89b950515
Component: engine
2015-09-23 17:20:34 -04:00
9e47501dca
Merge pull request #16525 from icecrime/fix_integration_cli
...
Fix integration cli
Upstream-commit: 8f8cc077d35fc053c394f420955297bb36cfa3e0
Component: engine
2015-09-23 13:52:28 -07:00
97e65cfb4f
Merge pull request #16521 from matthiasr/fix/syvinit-debian/basename-on-boot
...
Do not try to guess "docker" in Debian SysV init script
Upstream-commit: ce092ed08e9fb762d76501e9b99c132142bdaf6b
Component: engine
2015-09-23 13:46:19 -07:00
90fabf5056
Skip TestAppArmorDeniesChmodProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 04e1015aa06785210dc6a3e4d4ad66700a8d51b0
Component: engine
2015-09-23 13:23:15 -07:00
64940b5f4a
Skip TestRunUnshareProc
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 03dce24137c82caa04c215d983eac06a3edc084c
Component: engine
2015-09-23 13:23:08 -07:00
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
71a51a6ff7
Adding error codes to image package
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: da0ca83377db0228db82b7be4096b34e3ebfb114
Component: engine
2015-09-23 17:03:37 +00:00
5ee0f81315
Move more 'daemon' errors to the new error package
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 0a734182eb09497806a9ff3e1c8031ab1ab39f13
Component: engine
2015-09-23 09:51:45 -07:00
65ae094a39
refactor attach to not use internal data structures
...
- refactor to make it easier to split the api in the future
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 8aef1a33eb730a7c9b7e92b688bc63e6a3c69f62
Component: engine
2015-09-23 08:55:21 -07:00
7bd0a812b0
Add StdCopy happy path test: both reading and writing
...
Signed-off-by: Sergey Evstifeev <sergey.evstifeev@gmail.com >
Upstream-commit: 6335c90d4a0536bf625ec6e77b4a0040f877d133
Component: engine
2015-09-23 17:27:32 +02: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
871fe73c24
Do not try to guess "docker" in Debian SysV init script
...
On boot, the init script is invoked from `/etc/rcN.d/S20docker` (where N
is the runlevel). Consequently, the init script tried to find the
defaults at `/etc/defaults/S20docker` and the binary at
`/usr/bin/S20docker`. This causes the docker daemon to fail at boot with
the error
/usr/bin/S20docker not present or not executable
Starting it manually works because it invokes `/etc/init.d/docker` which
has the correct basename.
Fix this by hardcoding "docker" as the base name.
Signed-off-by: Matthias Rampke <mr@soundcloud.com >
Upstream-commit: 01c5cfcc5629e1d90a50a8447f9712fa6ff49f48
Component: engine
2015-09-23 11:27:34 +00:00
029099778a
Dockerfile: bump Go to 1.4.3
...
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com >
Upstream-commit: 34e41580f9d91aa529ae41021a10450cf749863b
Component: engine
2015-09-23 12:34:00 +03:00
55f78714ca
Clean up: show usage when global --help present
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 4d55877e278ea62b98927c6b9fb23b4b935431c1
Component: engine
2015-09-23 05:17:03 -04:00
75633de557
Format output of docker info
...
Format those info which will only be displayed when daemon is
in debug mode.
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 141e91c4803124bdf55dd45a06998748b0ef5fb2
Component: engine
2015-09-23 14:35:13 +08:00
d676c93895
Windows: [TP4] Add CPU Weight
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a5879bb83b8e2855e23b5a1e282940362fc35dba
Component: engine
2015-09-22 18:29:15 -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
030ce4b62a
Do not hardcode http as plugin URL scheme for secure connections.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: dc1761329768d337d7930059b334d45d016ebfd2
Component: engine
2015-09-22 15:54:29 -04: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
