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
Brian Goff
4e0eb91c55 Merge pull request #16649 from mtrmac/16648-test-text-fixups 
Fix text not matching the actual tests
 2015-09-29 12:01:19 -04:00
Doug Davis
992e464a80 Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test 
Fix TestAttachClosedOnContainerStop racey test
 2015-09-29 11:49:24 -04:00
Doug Davis
499b76d2ec Merge pull request #16641 from cpuguy83/16598_fix_TestExecStartFails 
Make sure test container is running before exec
 2015-09-29 11:25:14 -04:00
Vincent Demeester
50852f3be3 Fix TestAttachClosedOnContainerStop racey test 
This test is failing once in a while on the CI, because the docker
attach command might be called after the container ends.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-29 16:57:58 +02:00
Brian Goff
9077c89689 Make sure test container is running before exec 
Fixes race in TestExecStartFails

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2015-09-29 10:06:51 -04:00
Miloslav Trmač
8781367c77 Fix text not matching the actual tests 
Also fixes a typo in image name.

Fixes #16648

Signed-off-by: Miloslav Trmač <mitr@redhat.com>
 2015-09-29 15:26:04 +02:00
Alexander Morozov
d6e7350b96 Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand 
TestRunUnknownCommand 30s, not 30ns
 2015-09-28 14:31:48 -07:00
David Calavera
79dd76b602 Merge pull request #16636 from Microsoft/setrunninglocking 
Move setRunningLocking to test code
 2015-09-28 14:25:32 -07:00
Alexander Morozov
b50b928313 Merge pull request #16637 from Microsoft/10662-TestRunStdinBlockedAfterContainerExit 
Windows: Fix TestRunStdinBlockedAfterContainerExit
 2015-09-28 14:21:41 -07:00
John Howard
4d301f0059 Windows: Fix TestRunStdinBlockedAfterContainerExit 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-28 14:08:26 -07:00
Alexander Morozov
ab8a4102e1 Merge pull request #16608 from vdemeester/16585-revert-env-regexp 
Revert environment regexp in opts
 2015-09-28 13:54:17 -07:00
John Howard
eff253dfaf Move setRunningLocking to test code 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-28 13:48:12 -07:00
John Howard
74aeb0350e TestRunUnknownCommand 30s, not 30ns 
Signed-off-by: John Howard <jhoward@microsoft.com>
 2015-09-28 13:40:17 -07:00
Alexander Morozov
17062aea21 Merge pull request #16616 from sunyuan3/TestRunWithSwappinessInvalid 
Update TestRunWithSwappinessInvalid.
 2015-09-28 11:42:26 -07:00
Vincent Demeester
7335544fd0 Revert environment regexp from 13694 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-09-28 20:26:20 +02:00
Alexander Morozov
7669670f2d Merge pull request #16631 from coolljt0725/fix_typo 
Fix comment typo in attach.go
 2015-09-28 09:25:54 -07:00
Lei Jitang
4e62bd97d3 Fix comment typo in attach.go 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
 2015-09-28 08:59:40 -04:00
Yuan Sun
3571814dc5 Update TestRunWithSwappinessInvalid. 
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
 2015-09-28 18:13:21 +08:00
Andrea Luzzardi
9324b154d2 Merge pull request #16229 from icecrime/discovery 
Add builtin nodes discovery
 2015-09-27 18:06:27 -07:00
moxiegirl
486c12525f Merge pull request #16109 from charleswhchan/patch-3 
Touch up "Dockerfile reference"
 2015-09-27 15:12:17 -07:00
Arnaud Porterie
457a066ff0 Merge pull request #16603 from icecrime/add_more_vincent 
Add @vdemeester to MAINTAINERS
 2015-09-27 12:14:39 -07:00
Charles Chan
60f76bbfe1 Touch up "Dockerfile reference" 
- add example for `docker build -f ...`
- modifiy `FROM` explaination into bullet points
- add/clarify examples for `LABEL` and `ADD` instructions
- fix review comments (PR #16109)

Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
 2015-09-27 08:04:36 -07:00
moxiegirl
1cab5a50d0 Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page 
cleaning up the first few paragraphs of getting started with containers
 2015-09-27 08:02:14 -07:00
moxiegirl
f8f03a290c Merge pull request #16338 from twaugh/env-replacement-label 
Add documentation note that LABEL allows environment replacement
 2015-09-27 08:00:53 -07:00
Arnaud Porterie
6957b671bb Sort maintainers by name 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-26 08:11:36 -07:00
Arnaud Porterie
fcb9d8d899 Add @vdemeester to MAINTAINERS 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-26 08:09:44 -07:00
Madhu Venugopal
2ed0739c7a Merge pull request #16597 from brahmaroutu/vendor_libnetwork_gccgo_fix 
Vendoring in libnetwork with the fix for compilation error using GCCG…
 2015-09-25 21:22:02 -07:00
Srini Brahmaroutu
ba4c132491 Vendoring in libnetwork with the fix for compilation error using GCCGo (X86 GCCGO CI) 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-26 01:37:56 +00:00
moxiegirl
02eed8d666 Merge pull request #16063 from shishir-a412ed/man_docker_daemon 
man page for docker daemon command
 2015-09-25 15:42:06 -07:00
Tibor Vass
c32d22e6e4 Merge pull request #16531 from vbatts/vbatts-non-utf8-name-fix 
vendor: update tar-split to v0.9.10
 2015-09-25 17:55:11 -04:00
Arnaud Porterie
7d193ef1f3 Add builtin nodes discovery 
Use `pkg/discovery` to provide nodes discovery between daemon instances.

The functionality is driven by two different command-line flags: the
experimental `--cluster-store` (previously `--kv-store`) and
`--cluster-advertise`. It can be used in two ways by interested
components:

1. Externally by calling the `/info` API and examining the cluster store
   field. The `pkg/discovery` package can then be used to hit the same
   endpoint and watch for appearing or disappearing nodes. That is the
   method that will for example be used by Swarm.
2. Internally by using the `Daemon.discoveryWatcher` instance. That is
   the method that will for example be used by libnetwork.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-25 14:52:09 -07:00
Arnaud Porterie
166e082be3 Add pkg/discovery for nodes discovery 
Absorb Swarm's discovery package in order to provide a common node
discovery mechanism to be used by both Swarm and networking code.

Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
 2015-09-25 13:33:23 -07:00
Jess Frazelle
3c3d232e0a Merge pull request #16589 from mavenugo/ln_vin_ls 
Vendoring libnetwork and libkv
 2015-09-25 13:31:14 -07:00
David Calavera
f0e904df8e Merge pull request #16590 from Microsoft/10662-escapeargsfix 
Windows: Flags to cmd are now sent as two separate arguments
 2015-09-25 13:29:54 -07:00
Jess Frazelle
ff92f45be4 Merge pull request #16567 from calavera/context_per_request 
Define a context per request.
 2015-09-25 13:01:51 -07:00
Vincent Batts
ecedb3d81d vendor: update tar-split to v0.9.10 
This addresses handling of non-utf8 file names, namely iso-8859-1.

https://github.com/docker/docker/issues/16516

Reported-by: @kwk
Signed-off-by: Vincent Batts <vbatts@redhat.com>
 2015-09-25 14:42:17 -04:00
Jess Frazelle
80e31df3b6 Merge pull request #15916 from mikedougherty/release-flexibility 
Improve flexibility of release scripts
 2015-09-25 11:26:18 -07:00
Madhu Venugopal
6db1592066 Docker daemon changes to use default gateway service 
* Thanks to the Default gateway service in libnetwork, we dont have to add
containers explicitly to secondary public network. This is handled
automatically regardless of the primary network driver.

* Fixed the URL convention for kv-store to be aligned with the upcoming
changes to discovery URL

* Also, in order to bring consistency between external and internal network
drivers, we moved the driver configs via controller Init.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-25 11:00:42 -07:00
Alexandre Beslic
07cfac3d2d Merge pull request #16508 from MHBauer/create-refactor 
refactor create to not expose internal data structures
 2015-09-25 10:58:56 -07:00
Darren Stahl
5aa7c2317a Flags to cmd are now sent as two separate arguments 
This fixes a regression caused by PR #16538.

Signed-off-by: Darren Stahl <darst@microsoft.com>
 2015-09-25 10:37:53 -07:00
Jess Frazelle
7a1dbd17fc Merge pull request #16569 from brahmaroutu/ioutil_hang_gccgo 
goroutine fairness is not guaranteed causing the hang with GCCGO (x86 GCCGO CI)
 2015-09-25 10:24:13 -07:00
Jess Frazelle
2ecc7290d6 Merge pull request #16576 from Djelibeybi/rpm-docs 
Add documentation files
 2015-09-25 10:16:12 -07:00
Madhu Venugopal
59a000ec7f Vendoring libnetwork and libkv 
- Libnetwork brings in :
  * Default Gateway as a service for network drivers
  * Persistence for local scoped networks using libkv
  * BATS based Multi-host Integration-test infra and end-to-end tests
  * libnetwork fixes for zookeeper and etcd backend
- Libkv upgrade brings in :
  * boltdb support for local kv persistence
  * other general bug fixes

Signed-off-by: Madhu Venugopal <madhu@docker.com>
 2015-09-25 10:02:31 -07:00
Morgan Bauer
93bd57b0b2
refactor create to not expose internal data structures 
- use existing exposed type

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
 2015-09-25 09:35:18 -07:00
Shishir Mahajan
fada260ad2 man page for docker daemon command 
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
 2015-09-25 10:49:06 -04:00
Srini Brahmaroutu
7c52fcce85 goroutine fairness is not guaranteed causing the hang with GCCGO 
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
 2015-09-25 14:40:16 +00:00
Avi Miller
63e5891e4f Add documentation files including the LICENSE and CHANGELOG.md to the RPM 
Signed-off-by: Avi Miller <avi.miller@oracle.com>
 2015-09-25 17:44:11 +10:00
Doug Davis
02ae137b1d Merge pull request #16571 from skatsuta/fix-typo-comment-evaluator 
builder: fix typos in comments
 2015-09-24 23:44:00 -04:00
Jess Frazelle
b2b76894a1 Merge pull request #16468 from crosbymichael/bump_libcontainer 
Bump libcontainer to 5765dcd086eb0584c0e2eaff9a3ac97b467a98e6
 2015-09-24 16:53:28 -07:00
David Calavera
27c76522de Define a context per request. 
Avoid creating a global context object that will be used while the daemon is running.

Not only this object won't ever be garbage collected, but it won't ever be used for anything else than creating other contexts in each request. I think it's a bad practive to have something like this sprawling aroud the code.

This change removes that global object and initializes a context in the cases we don't have already one, like shutting down the server.
This also removes a bunch of context arguments from functions that did nothing with it.

Signed-off-by: David Calavera <david.calavera@gmail.com>
 2015-09-24 18:44:53 -04:00