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

16454 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
f51d77f86e Merge pull request #12548 from camallen/docker_host_docs 
add note in docs about DOCKER_HOST env var overriding unix socket config
 2015-07-02 01:27:47 +02:00
Alexander Morozov
75864dcb38 Merge pull request #14324 from aboch/ds 
Stats API to retrieve nw stats from libnetwork
 2015-07-01 15:19:46 -07:00
Alexander Morozov
9b9a4b2e59 Merge pull request #14329 from runcom/14318-fix-regression-cap-add-drop-as-single-string 
Fix regression in parsing capabilities
 2015-07-01 13:28:07 -07:00
Brian Goff
1751b40b04 Merge pull request #14333 from LK4D4/fix_tags 
Fix windows tag in pkg/term
 2015-07-01 16:27:57 -04:00
Alexander Morozov
7b3492df0c Fix windows tag in pkg/term 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2015-07-01 13:16:16 -07:00
Antonio Murdaca
10a3061c5f Fix regression in parsing capabilities list when a single string is given 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 21:28:02 +02:00
Alessandro Boch
8b40e44c39 Stats API to retrieve nw stats from libnetwork 
- Container networking statistics are no longer
  retrievable from libcontainer after the introduction
  of libnetwork. This change adds the missing code
  for docker daemon to retireve the nw stats from
  Endpoint.

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-07-01 11:15:16 -07:00
Alexander Morozov
358c022cac Merge pull request #14321 from MattHauglustaine/14266-return-envfile-parse-bufio-error 
Return bufio error when parsing env file
 2015-07-01 11:06:33 -07:00
Alexander Morozov
53b897ce9c Merge pull request #13744 from turtlebender/feature/whitelist-label-for-commit 
Support LABEL as change for `docker commit`
 2015-07-01 10:57:33 -07:00
Brian Goff
5fd0563505 Merge pull request #14322 from runcom/14320-fix-regression-attach-cont-notfound 
Return not found before hijacking in attach/wsattach
 2015-07-01 13:22:03 -04:00
Alexander Morozov
be5e1498c3 Merge pull request #14134 from vdemeester/runconfig-test-coverage 
Refactor and add tests coverage on package runconfig
 2015-07-01 10:15:26 -07:00
Antonio Murdaca
88d32a6109 Fix regression in containers attach/wsattach api, return not found before hijacking 
Signed-off-by: Antonio Murdaca <runcom@linux.com>
 2015-07-01 18:16:17 +02:00
David Calavera
1d7a62d776 Merge pull request #14314 from sunyuan3/TestRmiBlank 
Add the expected error verification for TestRmiBlank.
 2015-07-01 09:09:56 -07:00
David Calavera
d02540a44a Merge pull request #14305 from aboch/nwst 
Import latest libnetwork
 2015-07-01 09:07:40 -07:00
Matthieu Hauglustaine
0dadf11bec Add unit tests for ParseEnvFile. 
Add unit tests of the ParseEnvFile function. Test for:
* good file
* empty file
* non existent file
* badly formatted file

Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
 2015-07-01 17:43:03 +02:00
Matthieu Hauglustaine
e848494017 Return bufio error if set in ParseEnvFile 
Return an error value if bufio failed to properly read a token.
Avoids running a container with partial environment.

Fixes: #14266

Signed-off-by: Matthieu Hauglustaine <matt.hauglustaine@gmail.com>
 2015-07-01 17:17:48 +02:00
Yuan Sun
2179dd00dd Add the expected error verification for TestRmiBlank. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-07-01 19:34:43 +08:00
Vincent Demeester
d4aec5f0a6 Refactor test and add coverage to runconfig 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-07-01 10:16:36 +02:00
Alessandro Boch
126b1b2923 Import latest libnetwork 
- To bring in interface which retrieves endpoint statistics

Signed-off-by: Alessandro Boch <aboch@docker.com>
 2015-06-30 14:16:16 -07:00
David Calavera
bb2cd98b28 Merge pull request #14238 from rileytg/fix-graphdb-test-typo 
fixed typo in graphdb_test failure message
 2015-06-30 14:15:02 -07:00
Alexander Morozov
27af9a52a1 Merge pull request #14303 from cpuguy83/fix_nat_import 
Nat was moved to pkg/nat
 2015-06-30 13:56:11 -07:00
Brian Goff
d9af8551f8 Nat was moved to pkg/nat 
Somehow this import was missed

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-06-30 16:48:17 -04:00
David Calavera
a2621ac6da Merge pull request #14294 from mavenugo/bnone 
fixed incorrect assumption on --bridge=none treated as disable network
 2015-06-30 13:40:52 -07:00
Alexander Morozov
caa4acc7b1 Merge pull request #14297 from pwaller/move-nat-pkg 
Move /nat to /pkg/nat
 2015-06-30 13:23:30 -07:00
Madhu Venugopal
c9328c6ccf fixed incorrect assumption on --bridge=none treated as disable network 
libnetwork host, none and bridge driver initialization is incorrectly
disabled if the daemon flag --bridge=none. The expected behavior of
setting --bridge as none is to disable the bridge driver alone and let
all other modes to be operational.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-06-30 13:04:28 -07:00
Sebastiaan van Stijn
a453da2114 Merge pull request #13962 from unclejack/shrink_docs_images 
docs: shrink some big images
 2015-06-30 21:55:44 +02:00
Brian Goff
2de810df3f Merge pull request #14231 from ankushagarwal/checkValidPort 
Validate hostConfig on daemon. Check for invalid port specifications
 2015-06-30 15:54:24 -04:00
Arnaud Porterie
2d8dd6b93e Merge pull request #12846 from dave-tucker/network_integration 
integration-cli: Add Tests for IPv6 and Fixed CIDR
 2015-06-30 12:52:07 -07:00
Brian Goff
f13b40f6e7 Merge pull request #13524 from calavera/plugin_json_spec 
Plugins JSON spec.
 2015-06-30 15:44:48 -04:00
Ankush Agarwal
477201a295 Validate Port specifications on daemon side 
Fixes #14230

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-06-30 12:14:49 -07:00
Alexander Morozov
bb364ff459 Merge pull request #14268 from unclejack/lower_allocations_execdriver 
daemon: lower allocations
 2015-06-30 12:12:06 -07:00
David Calavera
96417dd6c3 Merge pull request #14211 from icecrime/roadmap 
Add ROADMAP.md
 2015-06-30 11:40:45 -07:00
Arnaud Porterie
aa5fb884b4 Add ROADMAP.md 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-06-30 10:17:08 -07:00
Peter Waller
9c2374d196 Move /nat to /pkg/nat 
By convention /pkg is safe to use from outside the docker tree, for example
if you're building a docker orchestrator.

/nat currently doesn't have any dependencies outside of /pkg, so it seems
reasonable to move it there.

This rename was performed with:

```
gomvpkg -vcs_mv_cmd="git mv {{.Src}} {{.Dst}}" \
	-from github.com/docker/docker/nat \
        -to   github.com/docker/docker/pkg/nat

```

Signed-off-by: Peter Waller <p@pwaller.net>
 2015-06-30 17:43:17 +01:00
moxiegirl
90024b952c Merge pull request #14267 from ankushagarwal/memory-swap-docs 
Typo in memory-swap flag
 2015-06-30 05:48:47 -07:00
unclejack
c1477db04f daemon: lower allocations 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2015-06-30 01:45:31 +03:00
Alexander Morozov
20467faf13 Merge pull request #14269 from vdemeester/pkg-parsers-test-coverage 
Add and refactor tests for pkg/parsers{,*}
 2015-06-29 15:24:14 -07:00
David Calavera
18d5d3ba03 Merge pull request #14133 from Microsoft/10662-netmode 
Windows: Refactor network modes
 2015-06-29 15:02:42 -07:00
Alexander Morozov
475ae0889e Merge pull request #14218 from calavera/fix_exec_user 
Default process user to container config user.
 2015-06-29 14:31:45 -07:00
Vincent Demeester
b81472a6d8 Add test coverage to pkg/parsers 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-06-29 22:30:11 +02:00
John Howard
c5e6a4b307 Windows: Refactor network modes 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-06-29 13:13:55 -07:00
Ankush Agarwal
e7e48bcfdd Typo in memory-swap flag 
Fixes #14253

Signed-off-by: Ankush Agarwal <ankushagarwal11@gmail.com>
 2015-06-29 13:12:08 -07:00
David Calavera
0faa4518ed Default process user to container config user. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-29 12:52:05 -07:00
James Turnbull
77396bd66a Merge pull request #14222 from erikdw/fix-casing-of-vmware-in-main-doc 
Use proper casing for VMware in README
 2015-06-29 15:16:01 -04:00
moxiegirl
4fd284bde0 Merge pull request #14244 from ankushagarwal/patch-1 
Update README.md
 2015-06-29 11:53:25 -07:00
Fred Lifton
0aea0e4072 Merge pull request #14261 from jeremyprice/basics-doc-typo-fix 
fix(docs): removed extra quote character in heading
 2015-06-29 11:05:54 -07:00
David Calavera
d543a01e17 Merge pull request #14061 from runcom/clean-builder-daemon-config 
Add struct to configure Builder commit
 2015-06-29 11:04:05 -07:00
David Calavera
333ac3a3eb Plugins JSON spec. 
Allow full configuration of external plugins via a JSON document.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-06-29 10:32:18 -07:00
Alexander Morozov
cb2079e218 Merge pull request #14193 from stevvooe/concurrent-pull-fix 
Attempt to protect on disk image store with mutex
 2015-06-29 10:28:02 -07:00
moxiegirl
985fd1c6cc Merge pull request #14243 from moxiegirl/carry-pr-13323 
Closes #13323 and carries
 2015-06-29 08:33:34 -07:00