John Gossman
91af3b1937
Addressed feedback. Will squash after further review
...
Signed-off-by: John Gossman <johngos@microsoft.com >
Upstream-commit: 4ce19da739ccdb8337c59f841e790255d21c6f50
Component: engine
2015-04-12 15:49:29 -07:00
Antonio Murdaca
b706b2d562
Remove engine from links
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 7560018541192ebdfe16e39515f9a04b44635d84
Component: engine
2015-04-12 16:25:10 +02:00
Doug Davis
6b4495dbae
Merge pull request #12305 from runcom/remove-job-exec-inspect
...
Remove job from execInspect
Upstream-commit: a54fd325e6bd0c5a1c298deef48399fe6e59aa33
Component: engine
2015-04-12 08:30:38 -04:00
Antonio Murdaca
d05177503f
Remove job from stop
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 04cc6c6aa4f8ea656d23268b7bff0136e4fc6c8d
Component: engine
2015-04-12 00:41:16 +02:00
Antonio Murdaca
62d48e6c18
Remove job from execInspect
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: 621ee1f6a4cbc8ee8758ce77a0cf6215c88f12f7
Component: engine
2015-04-12 00:15:34 +02:00
Vincent Demeester
2f631c4832
Add test on archive.go ( #11603 )
...
- Trying to add or complete unit test to each ``func``
- Removing dead code (``escapeName``)
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c4fe5dad1deb45ecde460d7627523dbf032dc205
Component: engine
2015-04-11 23:21:37 +02:00
John Gossman
aeebc69e43
Added some error messages and tracing to bridge network initialization
...
Signed-off-by: John Gossman <johngos@microsoft.com >
Upstream-commit: a9843cb739bd30a9e6eeb8841f645008e1fc905f
Component: engine
2015-04-11 11:15:24 -07:00
Eric Windisch
46973ec46d
HTTPS urls for ./project
...
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 5dc83233bc41fa4d8189aec6ce0327b06038c9b5
Component: engine
2015-04-11 13:58:09 -04:00
Eric Windisch
589be08227
HTTPS URLs for docs top-level & man pages
...
This updates all of docs outside of sources.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: ac65c8c3801385c8278e0740ef2738b0aa56689a
Component: engine
2015-04-11 13:43:26 -04:00
Eric Windisch
edf0b6037a
Link to HTTPS urls in contrib comments/maintainers
...
Updates comments and dockerfile maintainer lines
to use HTTPS urls where applicable.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: df9ee6d6563ace6e382a3bdd4a45b38756a76afb
Component: engine
2015-04-11 13:35:08 -04:00
Eric Windisch
0551904b7c
Link to HTTPS URLs in engine comments
...
Updates most of the instances of HTTP urls in the engine's
comments. Does not account for any use in the code itself,
documentation, contrib, or project files.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: ca37301d54e1525d4522dea266180072d4fd892b
Component: engine
2015-04-11 13:31:34 -04:00
Eric Windisch
428585dc12
HTTPS urls for ./hacking
...
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 723d43387a5c04ef8588c7e1557aa163e268581c
Component: engine
2015-04-11 13:22:16 -04:00
Eric Windisch
edaf94ae65
Use HTTPS for package URL
...
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 67a983fc372e7b5fd1c75d1ceafe9b79b84d7e92
Component: engine
2015-04-11 13:21:16 -04:00
Eric Windisch
87bd2b1fd6
Link to HTTPS URLs
...
Link to HTTPS URLs in top-level documentation / project files.
Signed-off-by: Eric Windisch <eric@windisch.us >
Upstream-commit: 787d774af0eb26aed16cbf24896e4ba051ba4538
Component: engine
2015-04-11 13:18:57 -04:00
James Turnbull
6fd02194d0
Merge pull request #12289 from sunyuan3/docker_remote_api
...
update docker_remote_api_v1.19.md
Upstream-commit: e3dd323336904c02aaf57a1ffe3dcc8cb666fc78
Component: engine
2015-04-11 09:27:36 -05:00
James Turnbull
933c2653a0
Merge pull request #12288 from sunyuan3/ubuntu
...
update ubuntulinux.md
Upstream-commit: 6d8102466a2b6af569aaa4e12bb0c66b0ff3594a
Component: engine
2015-04-11 09:25:55 -05:00
jianbosun
ca227f7854
change memory usage display
...
using standard unix postfixes add unit test for display
also change doc for memory usage display change
for example GiB will be GB
Signed-off-by: Sun Jianbo <wonderflow@zju.edu.cn >
Upstream-commit: d6d8f45b04a6e6d0b616c85d1885342d3e676ec1
Component: engine
2015-04-11 20:04:34 +08:00
Yuan Sun
dd126faafc
update docker_remote_api_v1.*
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 4f492e794ae9c9a51edae4bb5873187eadab828e
Component: engine
2015-04-11 18:11:49 +08:00
Qiang Huang
06600b0ef1
use hostConfig in verifyDaemonSettings
...
We have moved resource configs to hostConfig.
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com >
Upstream-commit: 39932511c134938233e8bfe4796cec9a1b30d11e
Component: engine
2015-04-11 16:37:28 +08:00
Brian Goff
884d515118
Merge pull request #12290 from yuchangchun1/typo
...
Fix a typo in TestVolumesFromGetsProperMode
Upstream-commit: e3c1cc8d77ea4be7d9e2c0041590a9da7d6920f6
Component: engine
2015-04-10 23:45:42 -04:00
Lei Jitang
0666a926f5
Add CFS_BANDWIDTH to check-config
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: d2d583c53b56a3ce069bf57ede9be9574c58a687
Component: engine
2015-04-11 11:39:47 +08:00
Lei Jitang
aaaa676179
Add docker exec run a command in privileged mode
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 72a500e9e5929b038816d8bd18d462a19e571c99
Component: engine
2015-04-11 11:26:37 +08:00
Lei Jitang
d1f2626097
Add -u|--user flag to docker exec for running command as a different user
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 2cce4791b0e75201cb65daad07d4203d1c4c2996
Component: engine
2015-04-11 11:04:24 +08:00
y00277921
b7982a6499
Fix a typo in comment of parseMaybeJSONToList
...
Signed-off-by: Yu Changchun <yuchangchun1@huawei.com >
Upstream-commit: 24dd8a4698315a4aafee5071f4fe4d74fa06c377
Component: engine
2015-04-11 10:34:21 +08:00
Deng Guangxing
d555f3e70e
'docker rmi -f IMAGE_ID' untag all names and delete the image
...
If an image has been tagged to multiple repos and tags, 'docker
rmi -f IMAGE_ID' will just untag one random repo instead of
untagging all and deleting the image. This patch implement
this. This commit is composed of:
*untag all names and delete the image
*add test to this feature
*modify commandline/cli.md to explain this
Signed-off-by: Deng Guangxing <dengguangxing@huawei.com >
Upstream-commit: 795a58fb44a2bd18ec37d78c82d75c025f786c50
Component: engine
2015-04-11 09:24:21 +08:00
Yuan Sun
7bfb104972
update ubuntulinux.md
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: a8fddbdeae6dfb8f6366cc476b37c84ed49f2732
Component: engine
2015-04-11 08:58:23 +08:00
Brian Goff
c6dc4ca317
Merge pull request #12274 from brahmaroutu/fix_gccgo_compilation
...
Unwanted declaration causing compilation issues with gccgo
Upstream-commit: 418195a4fb66d01e7fdf0ee236af3946fbe531b8
Component: engine
2015-04-10 20:22:45 -04:00
Jessie Frazelle
882b6484cb
Merge pull request #12283 from brendandixon/win-cli/wrapfix
...
Turned off Ctrl+C processing by Windows shell
Upstream-commit: d90da05b1b1033f9af2c4d5757f43a4d927a8245
Component: engine
2015-04-10 16:40:43 -07:00
Alexander Morozov
5dd956e210
Get process list after PID 1 dead
...
Fix #11087
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: ac8bd12b39d39a9361adc174bdff7837e771460d
Component: engine
2015-04-10 16:23:57 -07:00
moxiegirl
9302157d91
Merge pull request #12272 from nathanleclaire/bots_are_our_friends
...
Allow SEO crawling from docs site
Upstream-commit: f3e1178791cf5e47ab90c4cdf701dae35b43554d
Component: engine
2015-04-10 15:58:37 -07:00
Brendan Dixon
6607181ac9
Turned off Ctrl+C processing by Windows shell
...
Signed-off-by: Brendan Dixon <brendand@microsoft.com >
Upstream-commit: c337bfd2e0b0293dbca478a13c29a469493782eb
Component: engine
2015-04-10 15:43:35 -07:00
Nathan LeClaire
2ebe691b25
Allow SEO crawling from docs site
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
Docker-DCO-1.1-Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com > (github: nathanleclaire)
Upstream-commit: de03f4797b614fb192a72c83812c2a04a1939c87
Component: engine
2015-04-10 15:29:55 -07:00
Antonio Murdaca
e41d53c507
Remove job from commit
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: c8529fde5f6f2e4b62f9c1b3382fd814c11a7639
Component: engine
2015-04-11 00:20:45 +02:00
Brian Goff
65951704ad
Merge pull request #12103 from sunyuan3/pause
...
add TestContainerApiPause case
Upstream-commit: 001a7e6babbc832cd07304c2c3ec2ed4b852abbd
Component: engine
2015-04-10 18:04:29 -04:00
Tibor Vass
f10bd173bd
Merge pull request #11478 from dmcgowan/v2-vendored-api
...
Use v2 api from distribution
Upstream-commit: 563041b5c4acaca8e6ebb8fb4e81a3e7e7c37e81
Component: engine
2015-04-10 17:22:38 -04:00
Tibor Vass
44fddcaf4b
Merge pull request #11412 from vbatts/vbatts-dm_sync_is_required
...
devmapper: udev sync is a requirement
Upstream-commit: 23c12dabbdb7f895f606bbf2438599d29c53df3a
Component: engine
2015-04-10 16:52:38 -04:00
Brian Goff
847b362ddd
Merge pull request #12250 from runcom/remove-job-wait
...
Remove job from wait
Upstream-commit: 96313f7ce0c10ab2d038d35066cf9134358afdc8
Component: engine
2015-04-10 16:27:59 -04:00
root
fd315b5f1a
Unwanted declaration causing compilation issues with gccgo
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 73d08528ea9b043cbe941b1219b1c55625c636a8
Component: engine
2015-04-10 19:47:15 +00:00
Vincent Batts
d89c51c3b5
devmapper: storage-opt override for udev sync
...
This provides an override for forcing the daemon to still attempt
running the devicemapper driver even when udev sync is not supported.
Intended to be a very clear impairment for those choosing to use it. If
udev sync is false, there will still be an error in the daemon logs,
even when the override is in place. The docs have an explicit WARNING.
Including link to the docs for users that encounter this daemon error
during an upgrade.
Signed-off-by: Vincent Batts <vbatts@redhat.com >
Upstream-commit: 0e21782de5c038dfa3cfdfc7655b9e6b143baa7b
Component: engine
2015-04-10 15:43:16 -04:00
Doug Davis
59aa4a9b9f
Merge pull request #12271 from kostickm/12119-rename-TestStartSilentAttach
...
Rename TestStartSilentAttach to TestStartAttachSilent
Upstream-commit: 6d8bba0cc88538be645b8e66867adc44cfe3f640
Component: engine
2015-04-10 12:20:37 -07:00
moxiegirl
8c9e796ec1
Merge pull request #12218 from draghuram/apidoc_12055
...
Adds example request and Json parameter information for container
Upstream-commit: 6ab4878a015cecfc26426a9a9704ea04ac04666e
Component: engine
2015-04-10 11:22:57 -07:00
Antonio Murdaca
928371a2db
Remove job from wait
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
Upstream-commit: db0ffba3b92aeda667501aaa10926943a7738f82
Component: engine
2015-04-10 20:17:02 +02:00
Phil Estes
0e5a10f3c6
Merge pull request #12242 from tianon/functionalize-install
...
Wrap install.sh in a function
Upstream-commit: 904295fd716b5f02cd58a510e88fdf2bdcc9cd6b
Component: engine
2015-04-10 14:15:38 -04:00
Michael Crosby
1f992e6c96
Merge pull request #12259 from duglin/RemoveJobTop
...
Remove Job from `docker top`
Upstream-commit: bae3273ef4e61fd04c0dd4ddb1527aa7c4f9bfb6
Component: engine
2015-04-10 10:56:01 -07:00
Michael Crosby
ff94291067
Merge pull request #12248 from duglin/RemoveJobKill
...
Remove Job from `docker kill`
Upstream-commit: 267bd51adbf9e344a5d18bb0c7df4e09bcb60668
Component: engine
2015-04-10 10:52:18 -07:00
Megan Kostick
6adf3865a5
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
Upstream-commit: e7a2e2bf7e5adbbed0443cc99ab728d5118b3b7b
Component: engine
2015-04-10 10:45:38 -07:00
Tibor Vass
5f1006335a
Merge pull request #12238 from brendandixon/win-cli/fixes
...
Corrected int16 overflow and buffer sizes
Upstream-commit: 43aca9adac732f32bb04cc435a1bb58521fd9984
Component: engine
2015-04-10 13:36:23 -04:00
Richard Burnison
3f75ea937e
Only use fallback to short IDs when obvious.
...
As reported in #11294 , the Docker daemon will execute contains it
shouldn't run in the event that a requested tag is present in an image's
ID. This leads to the wrong image being started up silently.
This change reduces the risk of such a collision by using the short ID
iff the actual revOrTag looks like a short ID (not that it necessarily
is).
Signed-off-by: Richard Burnison <rburnison@ebay.com >
Upstream-commit: 8d1a500303a9dd892301e343c94821207c715fbb
Component: engine
2015-04-10 13:20:44 -04:00
Arnaud Porterie
fdca34bdb1
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
Upstream-commit: 7cec5f50c51d91660c5b2ea2f4a9cf4dc6762b82
Component: engine
2015-04-10 08:29:29 -07:00
Raghuram Devarakonda
41fc757124
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
Upstream-commit: 202e0380f36be93ace139cb52e6c4752d195a034
Component: engine
2015-04-10 11:10:41 -04:00