0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
18578 commits 14 branches 412 tags 338 MiB
Commit graph

18578 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jess Frazelle
52d7542195 Merge pull request #16377 from runcom/add-stats-tests 
integration-cli: add cli/api stats tests when container not found
 2015-09-17 13:43:02 -07:00
Jess Frazelle
4a707c9ad9 Merge pull request #16364 from wcwxyz/master 
Preserve /etc/sysconfig/docker across rpm update
 2015-09-17 13:36:17 -07:00
Doug Davis
a283a30fb0 Move api/errors/ to errors/ 
Per @calavera's suggestion: https://github.com/docker/docker/pull/16355#issuecomment-141139220

Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-09-17 11:54:14 -07:00
Jess Frazelle
4702d45599 Merge pull request #16271 from runcom/deprecate-cli-opts 
Deprecate -c cli short variant flag in docker run
 2015-09-17 11:52:59 -07:00
Jess Frazelle
96c735a724 Merge pull request #16354 from tomdee/patch-3 
Update the instructions for building experimental docker binaries
 2015-09-17 11:50:07 -07:00
Jess Frazelle
828e4ac45a Merge pull request #16355 from duglin/DaemonErrors 
Convert some "daemon" static error strings to the new errocode package format
 2015-09-17 11:48:37 -07:00
David Calavera
57c6012cf0 Merge pull request #16375 from sunyuan3/makefile 
from make file to Makefile
 2015-09-17 10:10:18 -07:00
Antonio Murdaca
66be81b148 integration-cli: add cli/api stats tests when container not found 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-17 18:20:25 +02:00
David Calavera
cfd3080a80 Merge pull request #15898 from Microsoft/15775-buildcontextfix 
Windows: Fix long path handling for docker build
 2015-09-17 09:19:23 -07:00
Yuan Sun
5e7895ee21 from make file to Makefile 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-09-17 15:37:50 +00:00
Antonio Murdaca
e33b8b11af Merge pull request #16370 from mountkin/daemon-cleanup 
remove the unused run() and output() functions in daemon/container.go
 2015-09-17 17:33:55 +02:00
David Calavera
cafee2eb45 Merge pull request #16361 from MHBauer/stats-refactor 
refactor stats to not use internal data structures
 2015-09-17 08:28:07 -07:00
Antonio Murdaca
e5a26ec081 Deprecate -c cli short variant flag in docker run 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-17 15:48:48 +02:00
Brian Goff
3b168b29f2 Merge pull request #16372 from runcom/skip-racey-twst 
Skip racey TestDockerCmdInDirWithTimeout
 2015-09-17 09:47:08 -04:00
Antonio Murdaca
f172847205 Skip racey TestDockerCmdInDirWithTimeout 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-09-17 15:30:07 +02:00
Shijiang Wei
b79782e951 remove the unused run() and output() functions in daemon/container.go 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
 2015-09-17 19:22:25 +08:00
Antonio Murdaca
ffaee8fe78 Merge pull request #16336 from mountkin/fix-hijack 
error should be checked earlier in the hijack function
 2015-09-17 09:38:48 +02:00
WANG Chao
b51918fba1 Preserve /etc/sysconfig/docker across rpm update 
Otherwise we have to reconfigure every time docker rpm got update.

Signed-off-by: WANG Chao <wcwxyz@gmail.com>
 2015-09-17 12:12:28 +08:00
Tibor Vass
1ffff4c8e2 Merge pull request #15182 from mapuri/build-arg 
Support for passing build-time variables in build context
 2015-09-16 23:52:37 -04:00
Brian Goff
4dfa996cc2 Merge pull request #15384 from phil-monroe/15058-include-name-in-syslog-tag 
log driver - Interpolate fields into log tag
 2015-09-16 23:33:34 -04:00
Morgan Bauer
2d5d606fd3
refactor stats to not use internal data structures 
- refactor to make it easier to split the api in the future
 - addition to check the existing test case and make sure it contains
   some expected output

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-16 17:28:52 -07:00
David Calavera
b0b3bc56d0 Merge pull request #16357 from Microsoft/10662-enabledockervolume 
Windows: Enable docker volume
 2015-09-16 16:42:50 -07:00
Doug Davis
f7d4b4fe2b Convert some "daemon" static error strings to the new errocode package format 
Signed-off-by: Doug Davis <dug@us.ibm.com>
 2015-09-16 16:16:42 -07:00
David Calavera
9ab8c2d92e Merge pull request #16358 from mrjana/mh 
Vendoring libnetwork
 2015-09-16 15:47:47 -07:00
Arnaud Porterie
0ac28f5e48 Merge pull request #16294 from jfrazelle/cleanup-vendor 
cleanup vendoring of test deps
 2015-09-16 15:45:36 -07:00
Tibor Vass
9a8f1b7673 Merge pull request #16359 from cpuguy83/skip_racey_test 
Skip racey TestDockerCmdWithTimeout
 2015-09-16 18:37:14 -04:00
Brian Goff
5cf3a6e010 Skip racey TestDockerCmdWithTimeout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-09-16 18:36:35 -04:00
Sebastiaan van Stijn
3394fedf32 Merge pull request #16269 from moxiegirl/fixes-15790 
Clarifying use of flag
 2015-09-17 00:23:25 +02:00
Philip Monroe
3be7146e14 log driver - add ability to interpolate container context into the log tag field 
Signed-off-by: Philip Monroe <phil@philmonroe.com>
 2015-09-16 15:19:28 -07:00
Antonio Murdaca
5cbcbfc03c Merge pull request #16031 from thockin/14069-dns-options 
Add support for DNS options
 2015-09-16 23:59:19 +02:00
Jana Radhakrishnan
a803148bba Vendoring libnetwork 
To fix an issue with experimental multihost networking.
git hash: 00a92f066e628e4c6d50979c070df377575aad18

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
 2015-09-16 14:48:42 -07:00
Brian Goff
677a6eaf8f Merge pull request #16261 from vdemeester/integration-dockercmd 
Move dockerCmd to pkg/integration and add tests to it
 2015-09-16 17:40:33 -04:00
John Howard
42a46ed1a4 Windows: Enabled docker volume 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-16 14:33:13 -07:00
David Calavera
4a2c3733bd Merge pull request #16351 from mavenugo/vin_ln_kv 
Vendoring in libnetwork and libkv
 2015-09-16 14:10:49 -07:00
Tim Hockin
3d4685e258 Add support for DNS options 
Signed-off-by: Tim Hockin <thockin@google.com>
 2015-09-16 14:06:45 -07:00
David Calavera
b9a3660d1e Merge pull request #16316 from vbatts/vbatts-events 
daemon/events: let Log be [slightly] blocking
 2015-09-16 13:57:06 -07:00
David Calavera
fb01c2ea3c Merge pull request #16350 from cpuguy83/fix_error_on_dev-snd_test 
Skip TestRunDeviceDirectory when no /dev/snd
 2015-09-16 13:56:11 -07:00
Jess Frazelle
ac34ce0307 Merge pull request #16305 from estesp/hooks-for-the-hooks-gods 
Use libcontainer hook for network namespace info passing to libnetwork's sandbox
 2015-09-16 13:55:16 -07:00
Alexander Morozov
5b99591e18 Merge pull request #16308 from runcom/graph-unparam 
graph: remove unused functions parameters
 2015-09-16 13:54:23 -07:00
David Calavera
c1e59b94e2 Merge pull request #16345 from albers/completion-extglob-fix 
[Fix 16326] Bash completion syntax error on OSX
 2015-09-16 13:43:02 -07:00
Jess Frazelle
74a8f2f668 Merge pull request #15861 from brahmaroutu/gccgo_x86 
Enable building Docker with gcc-go on x86
 2015-09-16 13:29:02 -07:00
Tom Denham
f9e9a622f0 Update the instructions for building experimental docker binaries 
There is no dynbinary target.

Signed-off-by: Tom Denham <tom@tomdee.co.uk>
 2015-09-16 13:18:32 -07:00
David Calavera
bfc4e38429 Merge pull request #16320 from 0xfoo/remove-unused-var 
Remove unused variable, fix #16310
 2015-09-16 13:17:10 -07:00
Srini Brahmaroutu
2c53643b33 adding a Dockerfile.gccgo to use gccgo compiler instead of go compiler. 
temporarily disabling registry builds as crypto package is broken with gccgo.

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-16 18:56:01 +00:00
Madhu Venugopal
814c19591d Vendoring in libnetwork and libkv 
* libkv upgrade is required for the docker discovery PR
* vendor-in libnetwork contains an update to network plugin api
  (Thanks @WeiZhang555 : https://github.com/docker/libnetwork/pull/516)

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-16 11:54:28 -07:00
Brian Goff
88b895111b Skip TestRunDeviceDirectory when no /dev/snd 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-09-16 14:43:30 -04:00
Sebastiaan van Stijn
259a0fb16c Merge pull request #15786 from HuKeping/stats-network 
Refactor the statistics of network in docker stats
 2015-09-16 20:29:16 +02:00
Mary Anthony
a2f545c86d Clarifying use of flag 
Updating with Seb's comments
Updating with comments from review

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-16 11:22:40 -07:00
David Calavera
60db152b20 Merge pull request #16292 from tpounds/fix-doc-typo 
Fix minor documentation typo.
 2015-09-16 11:18:17 -07:00
David Calavera
552c361f39 Merge pull request #16347 from jfrazelle/revert-ulp 
Revert "Make daemon to start with no userlandproxy by default"
 2015-09-16 10:01:11 -07:00