Dan Farrelly
efeb23d4a7
Merge pull request #3 from nathanleclaire/djfarrelly-filter-create-help-cmd
...
Fix ordering issue
2015-04-10 13:48:39 -04:00
Megan Kostick
e7a2e2bf7e
Rename TestStartSilentAttach to TestStartAttachSilent
...
Signed-off-by: Megan Kostick <mkostick@us.ibm.com >
2015-04-10 10:45:38 -07:00
Nathan LeClaire
2059647ccb
Fix ordering issue
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-04-10 10:41:20 -07:00
Tibor Vass
43aca9adac
Merge pull request #12238 from brendandixon/win-cli/fixes
...
Corrected int16 overflow and buffer sizes
2015-04-10 13:36:23 -04:00
Richard Burnison
8d1a500303
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 >
2015-04-10 13:20:44 -04:00
Arnaud Porterie
7cec5f50c5
Merge pull request #12209 from ahmetalpbalkan/daemon/cli-help-log-driver-reword
...
cli: Better wording for daemon --log-driver
2015-04-10 08:29:29 -07:00
Raghuram Devarakonda
202e0380f3
Adds example request and Json parameter information for container
...
start API.
Closes #10304 .
Signed-off-by: Raghuram Devarakonda <draghuram@gmail.com >
2015-04-10 11:10:41 -04:00
Yan Feng
bfc68d10ed
A wrong key.json would remain if the TestDaemonwithwrongkey case fails. The issue would lead to failure of other cases.
...
Signed-off-by: Yan Feng <yanfeng2@huawei.com >
2015-04-10 11:10:26 -04:00
Vincent Bernat
91d12d06ec
drivers: remove unneeded GetDockerConfigDir() and dockerConfigDir const
...
This method is not part of the driver interface anymore.
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-10 17:03:11 +02:00
Evan Hazlett
0c64d0538f
Merge pull request #990 from ehazlett/ssh-key-win
...
fix ssh key gen bug windows
2015-04-10 11:00:45 -04:00
Vincent Bernat
bbe1bf42c8
fakedriver: remove useless methods
...
Since the refactor done in #756 , some methods have been removed from the
driver interface. Remove those methods from `fakedriver`:
- `StartDocker()`
- `StopDocker()`
- `GetDockerConfigDir()`
- `GetSSHCommand()`
Signed-off-by: Vincent Bernat <Vincent.Bernat@exoscale.ch >
2015-04-10 16:55:45 +02:00
Evan Hazlett
7f55d3ba01
fix ssh key gen bug windows
...
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com >
2015-04-10 10:35:25 -04:00
Brian Goff
0693e34d7e
Merge pull request #12260 from HuKeping/rmjob-history
...
Remove Job from History API
2015-04-10 09:53:05 -04:00
Evan Hazlett
dfa155938a
Merge pull request #885 from sthulb/ssh-keys
...
Add SSH key generation
2015-04-10 09:39:24 -04:00
Hu Keping
5c7c3fea6c
Remove Job from History API
...
a part of issue #12151
Signed-off-by: Hu Keping <hukeping@huawei.com >
2015-04-10 21:37:56 +08:00
Evan Hazlett
bb08fcfbf9
Merge pull request #932 from Fangfenghua/patch-6
...
Update index.md
2015-04-10 09:21:23 -04:00
Doug Davis
5c8e28ec7c
Merge pull request #12263 from chenhanxiao/typo-resize-test
...
api_resize_test: fix a typo
2015-04-10 05:46:42 -07:00
Chen Hanxiao
4ddc721f23
api_resize_test: fix a typo
...
s/cintainer/container
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-10 03:09:26 -04:00
Chen Hanxiao
5037297388
cp: add support for copy filename with ":"
...
We use ":" as separator CONTAINER:PATH.
This patch enables copy filename with ":"
to host.
Signed-off-by: Chen Hanxiao <chenhanxiao@cn.fujitsu.com >
2015-04-10 00:08:05 -04:00
Tibor Vass
296323cd6c
Merge pull request #12210 from tiborvass/carry-9916
...
Carry 9916: add comment column in docker history command
2015-04-10 00:02:00 -04:00
Andrea Luzzardi
b250a3a5cf
Merge pull request #582 from chanwit/test-zk-discovery
...
integration: test for ZooKeeper discovery
2015-04-09 20:11:30 -07:00
Evan Hazlett
2ccf832c4d
Merge pull request #973 from wlan0/master
...
make ssh username configurable for ec2
2015-04-09 22:28:03 -04:00
Derek McGowan
142d62798e
Rename top level registry interface to namespace
...
Registry is intended to be used as a repository service than an abstract collection of repositories. Namespace better describes a collection of repositories retrievable by name.
The registry service serves any repository in the global scope.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
2015-04-09 19:21:33 -07:00
Stephen J Day
4d91e791c0
Disassociate instance id from application
...
This moves the instance id out of the app so that it is associated with an
instantiation of the runtime. The instance id is stored on the background
context. This allows allow contexts using the main background context to
include an instance id for log messages. It also simplifies the application
slightly.
Signed-off-by: Stephen J Day <stephen.day@docker.com >
2015-04-09 18:45:39 -07:00
Stephen Day
5dd885b311
Merge pull request #325 from moxiegirl/docs-restructure
...
Breaking out README
2015-04-09 18:31:42 -07:00
Tibor Vass
fa2ace00a8
Rebase + some fixes
...
Signed-off-by: Tibor Vass <tibor@docker.com >
2015-04-09 21:29:42 -04:00
David Young
8d682bf734
Refine document by review comments
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:42 -04:00
David Young
bf57339527
Add comment column in docker history command output
...
Signed-off-by: David Young <yangboh@cn.ibm.com >
2015-04-09 21:29:41 -04:00
Tianon Gravi
6842bba163
Commonalize more bits of install.sh (especially standardizing around "cat <<-EOF")
...
Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com >
2015-04-09 19:28:25 -06:00
Dan Farrelly
4ae4424895
Merge pull request #1 from nathanleclaire/djfarrelly-filter-create-help-cmd
...
Make nitpicky modifications
2015-04-09 21:28:08 -04:00
Alexander Morozov
e690ad9292
Merge pull request #12256 from WiseTrem/remove_go1.2
...
Remove pools_nopool.go & build tag from pools.go
2015-04-09 18:25:09 -07:00
Doug Davis
3e096cb9c9
Remove Job from docker top
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-09 18:17:50 -07:00
Yuan Sun
8636a21991
add TestContainerApiPause case
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
2015-04-10 09:14:01 +08:00
Mary Anthony
cf9b4ab5e9
Breaking out README
...
Adding new material
Adding in template chomped in error
Cover install/deploy in README
Adding in Stephen's comments
Fixing you tabs!
Updating with commentary from pr
Updating with last minute comments
Signed-off-by: Mary Anthony <mary@docker.com >
2015-04-09 17:50:46 -07:00
Jeffrey Morgan
33c8ca3ad0
Update README.md
2015-04-09 20:37:18 -04:00
Jeffrey Morgan
d746a5a24f
Update README.md
2015-04-09 20:37:02 -04:00
Nathan LeClaire
379de3acec
Make nitpicky modifications
...
Signed-off-by: Nathan LeClaire <nathan.leclaire@gmail.com >
2015-04-09 17:17:10 -07:00
Jeffrey Morgan
f140b870e5
Merge pull request #372 from kitematic/improve-logs
...
Fixes for log issues
2015-04-09 20:08:51 -04:00
Michael Crosby
404f81011b
Merge pull request #12254 from runcom/remove-job-resize-execresize
...
Remove job from resize&execResize
2015-04-09 17:00:58 -07:00
Jeffrey Morgan
bc4b37cffd
Better log performance by capping at 3000 lines. Detach stream when log view is unmounted.
...
Signed-off-by: Jeffrey Morgan <jmorganca@gmail.com >
2015-04-09 19:57:17 -04:00
Olivier Gambier
64a1aa89bd
Merge pull request #339 from stevvooe/signature-fetch-prevent-false-sharing
...
registry/storage: prevent false sharing in signature fetch
2015-04-09 16:55:10 -07:00
moxiegirl
02f6d7f98a
Merge pull request #12252 from kostickm/update-contributor-guide-docs
...
Docs cleanup - Contributor Guide
2015-04-09 16:54:08 -07:00
WiseTrem
f01d755cd0
Remove pools_nopool.go & build tag from pools.go
...
Fix #11576
Signed-off-by: Gleb Shepelev <shepelyov.g@gmail.com >
2015-04-10 02:32:55 +03:00
Fred Lifton
2a442ec6d9
Adds Where to Get Help section
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
2015-04-09 16:23:25 -07:00
Doug Davis
3cb751906a
Remove Job from docker kill
...
Signed-off-by: Doug Davis <dug@us.ibm.com >
2015-04-09 16:06:54 -07:00
Antonio Murdaca
e290a22dc9
Remove job from resize&execResize
...
Signed-off-by: Antonio Murdaca <me@runcom.ninja >
2015-04-10 00:56:43 +02:00
Fred Lifton
71f4e13493
Updates for 1.6 release
...
Adds release notes and getting help section.
Signed-off-by: Fred Lifton <fred.lifton@docker.com >
2015-04-09 15:51:38 -07:00
Aleksandr Vinokurov
ceff5cb9ca
Add parent directories search for default compose-files
...
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946 .
Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com >
2015-04-09 22:36:47 +00:00
Michael Crosby
eebfcde0ea
Merge pull request #12249 from runcom/remove-job-pause-unpause
...
Remove job from pause/unpause
2015-04-09 15:09:48 -07:00
David Lawrence
36d8ce0094
interfaces all work together now and it builds
2015-04-09 14:56:57 -07:00