31b882e793
Merge pull request #16642 from vdemeester/remove-question-make-in-pkg-devicemapper
...
Remove "(?)" from comments in pkg/devicemapper
2015-09-30 09:39:23 -04:00
c300978370
Merge pull request #16562 from Microsoft/10662-fixhttppull
...
Windows: Fix ADD from URL in dockerfile
2015-09-30 11:46:57 +02:00
1dcb7d9e40
Remove (?) from comments in pkg/devicemapper
...
Got merged with it, removing it as it doesn't add anything.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-30 10:35:02 +02:00
729c9a9782
Merge pull request #16580 from coolljt0725/unpause_all_container_on_exit
...
Make sure the container will always be unpaused on test exit
2015-09-29 21:44:23 -04:00
36592a4bc2
Merge pull request #16666 from calavera/golint_graph_windows
...
Fix golint issues on the windows graph driver.
2015-09-29 17:36:37 -07:00
ae03e544e7
Merge pull request #16650 from cpuguy83/no_named_volumes_for_builder
...
Do not parse config.Volumes for named volumes
2015-09-29 17:04:29 -07:00
da982cf551
Separate API router from server.
...
Implement basic interfaces to write custom routers that can be plugged
to the server. Remove server coupling with the daemon.
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-29 19:43:03 -04:00
144abf2a58
Merge pull request #16659 from tiborvass/revert-context
...
Remove custom context package and use golang's only for api/server
2015-09-29 16:11:24 -07:00
1fffc7a89d
Fix golint issues on the windows graph driver.
...
Signed-off-by: David Calavera <david.calavera@gmail.com>
2015-09-29 18:32:45 -04:00
94e3b0f428
Use golang.org/x/net/context in api/server/
...
This patch removes the internal context package and uses golang's
package instead.
Signed-off-by: Tibor Vass <tibor@docker.com>
2015-09-29 17:40:55 -04:00
724b410c55
Merge pull request #16656 from shishir-a412ed/man_docker_daemon_dns-opt
...
Add dns-opt option to docker daemon man page
2015-09-29 14:07:43 -07:00
949270ba7c
Merge pull request #16661 from brahmaroutu/gccgo_ci_stretchr_fix
...
Vendor in stretchr/testify to fix GCCGO issue with function name parsing (GCCGO CI)
2015-09-29 13:53:35 -07:00
81c42d6c1e
Vendor in stretchr/testify to fix GCCGO issue with function name parsing
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
2015-09-29 19:20:03 +00:00
b08f071e18
Revert "Merge pull request #16228 from duglin/ContextualizeEvents"
...
Although having a request ID available throughout the codebase is very
valuable, the impact of requiring a Context as an argument to every
function in the codepath of an API request, is too significant and was
not properly understood at the time of the review.
Furthermore, mixing API-layer code with non-API-layer code makes the
latter usable only by API-layer code (one that has a notion of Context).
This reverts commit de416404357daeecd42d
2015-09-29 14:26:51 -04:00
2fb5d0c323
Add constants for AUFS whiteout files
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-09-29 11:21:45 -07:00
79c31f4b13
Revert "Merge pull request #16567 from calavera/context_per_request"
...
This reverts commit ff92f45be480e31df3b6
2015-09-29 13:40:46 -04:00
252af0ae2f
Merge pull request #16570 from duglin/ReaderFix
...
Make Close() on simpleReaderCloser actually close the reader
2015-09-29 12:55:03 -04:00
8db945abb9
Add dns-opt option to docker daemon man page
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com>
2015-09-29 12:31:51 -04:00
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
992e464a80
Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test
...
Fix TestAttachClosedOnContainerStop racey test
2015-09-29 11:49:24 -04:00
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
00e3277107
Add basic support for .wh..wh..opq
...
This fixes the case where directory is removed in
aufs and then the same layer is imported to a
different graphdriver.
Currently when you do `rm -rf /foo && mkdir /foo`
in a layer in aufs the files under `foo` would
only be be hidden on aufs.
The problems with this fix:
1) When a new diff is recreated from non-aufs driver
the `opq` files would not be there. This should not
mean layer differences for the user but still
different content in the tar (one would have one
`opq` file, the others would have `.wh.*` for every
file inside that folder). This difference also only
happens if the tar-split file isn’t stored for the
layer.
2) New files that have the filenames before `.wh..wh..opq`
when they are sorted do not get picked up by non-aufs
graphdrivers. Fixing this would require a bigger
refactoring that is planned in the future.
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2015-09-29 08:22:25 -07:00
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
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
8e5bb8fdd3
Do not parse config.Volumes for named volumes
...
Fixes an issue where `VOLUME some_name:/foo` would be parsed as a named
volume, allowing access from the builder to any volume on the host.
This makes sure that named volumes must always be passed in as a bind.
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-09-29 10:01:57 -04:00
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
7eab3db324
Fix TestDockerCmd*Timeout racey tests
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-29 14:50:22 +02:00
d6e7350b96
Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
...
TestRunUnknownCommand 30s, not 30ns
2015-09-28 14:31:48 -07:00
79dd76b602
Merge pull request #16636 from Microsoft/setrunninglocking
...
Move setRunningLocking to test code
2015-09-28 14:25:32 -07:00
b50b928313
Merge pull request #16637 from Microsoft/10662-TestRunStdinBlockedAfterContainerExit
...
Windows: Fix TestRunStdinBlockedAfterContainerExit
2015-09-28 14:21:41 -07:00
4d301f0059
Windows: Fix TestRunStdinBlockedAfterContainerExit
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-28 14:08:26 -07:00
ab8a4102e1
Merge pull request #16608 from vdemeester/16585-revert-env-regexp
...
Revert environment regexp in opts
2015-09-28 13:54:17 -07:00
eff253dfaf
Move setRunningLocking to test code
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-28 13:48:12 -07:00
74aeb0350e
TestRunUnknownCommand 30s, not 30ns
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-09-28 13:40:17 -07:00
17062aea21
Merge pull request #16616 from sunyuan3/TestRunWithSwappinessInvalid
...
Update TestRunWithSwappinessInvalid.
2015-09-28 11:42:26 -07:00
7335544fd0
Revert environment regexp from 13694
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-09-28 20:26:20 +02:00
4acf29a808
Command line, manpage and deprecation documentation.
...
Signed-off-by: Richard Scothern <richard.scothern@gmail.com>
2015-09-28 10:31:04 -07:00
7669670f2d
Merge pull request #16631 from coolljt0725/fix_typo
...
Fix comment typo in attach.go
2015-09-28 09:25:54 -07:00
c576310b6f
Add zsh completion for --cluster-store and --cluster-advertise options for docker daemon
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-09-28 15:13:42 +02:00
4e62bd97d3
Fix comment typo in attach.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-09-28 08:59:40 -04:00
3571814dc5
Update TestRunWithSwappinessInvalid.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com>
2015-09-28 18:13:21 +08:00
1c71c1995f
bash completion for `docker daemon --cluster-*`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-09-28 11:23:23 +02:00
9324b154d2
Merge pull request #16229 from icecrime/discovery
...
Add builtin nodes discovery
2015-09-27 18:06:27 -07:00
486c12525f
Merge pull request #16109 from charleswhchan/patch-3
...
Touch up "Dockerfile reference"
2015-09-27 15:12:17 -07:00
457a066ff0
Merge pull request #16603 from icecrime/add_more_vincent
...
Add @vdemeester to MAINTAINERS
2015-09-27 12:14:39 -07:00
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
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
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
94464e3a5e
Validate --cpuset-cpus, --cpuset-mems
...
Before this patch libcontainer badly errored out with `invalid
argument` or `numerical result out of range` while trying to write
to cpuset.cpus or cpuset.mems with an invalid value provided.
This patch adds validation to --cpuset-cpus and --cpuset-mems flag along with
validation based on system's available cpus/mems before starting a container.
Signed-off-by: Antonio Murdaca <runcom@linux.com>
2015-09-27 16:38:58 +02:00
6957b671bb
Sort maintainers by name
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-09-26 08:11:36 -07:00
Brian Goff
Antonio Murdaca
Vincent Demeester
Alexander Morozov
David Calavera
Tibor Vass
moxiegirl
Srini Brahmaroutu
Tonis Tiigi
Shishir Mahajan
Doug Davis
Miloslav Trmač
John Howard
Richard Scothern
Steve Durrheimer
Lei Jitang
Yuan Sun
Harald Albers
Andrea Luzzardi
Arnaud Porterie
Charles Chan
Antonio Murdaca