bc369be3ad
Merge pull request #16539 from calavera/router_interfaces
...
Separate API router from server.
Upstream-commit: 4f677df0d1fe1cdb24ecacd16f8692a6c46ffc21
Component: engine
2015-09-30 11:51:30 -04:00
af103c04cf
Merge pull request #16642 from vdemeester/remove-question-make-in-pkg-devicemapper
...
Remove "(?)" from comments in pkg/devicemapper
Upstream-commit: 31b882e793f14e13b9b9d023d12fed69a4f4b118
Component: engine
2015-09-30 09:39:23 -04:00
d0e8d580f1
Merge pull request #16562 from Microsoft/10662-fixhttppull
...
Windows: Fix ADD from URL in dockerfile
Upstream-commit: c3009783700154b6f0ad26bb492ddda9da783ad4
Component: engine
2015-09-30 11:46:57 +02:00
376a910561
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 >
Upstream-commit: 1dcb7d9e40d0ee5f9ab068fed55d3072246ce8ec
Component: engine
2015-09-30 10:35:02 +02:00
a1b5e8a4f8
Merge pull request #16580 from coolljt0725/unpause_all_container_on_exit
...
Make sure the container will always be unpaused on test exit
Upstream-commit: 729c9a97822ebee2c978a322d37060454af6bc66
Component: engine
2015-09-29 21:44:23 -04:00
c48d02c824
Merge pull request #16666 from calavera/golint_graph_windows
...
Fix golint issues on the windows graph driver.
Upstream-commit: 36592a4bc2c50cf8c84c494f467057c989475a1b
Component: engine
2015-09-29 17:36:37 -07:00
2a8c716e73
Merge pull request #16650 from cpuguy83/no_named_volumes_for_builder
...
Do not parse config.Volumes for named volumes
Upstream-commit: ae03e544e78dd478c72021fa72fd91351553fba5
Component: engine
2015-09-29 17:04:29 -07:00
1fb74bb17c
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 >
Upstream-commit: da982cf5511814b6897244ecaa9c016f8800340a
Component: engine
2015-09-29 19:43:03 -04:00
e5db2c0e2f
Merge pull request #16659 from tiborvass/revert-context
...
Remove custom context package and use golang's only for api/server
Upstream-commit: 144abf2a58b9ad3ca4cb23b48e8a0b5e288962c3
Component: engine
2015-09-29 16:11:24 -07:00
eb95300866
Fix golint issues on the windows graph driver.
...
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 1fffc7a89dd69800317e881009188871906cce6a
Component: engine
2015-09-29 18:32:45 -04:00
a6a6684e96
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 >
Upstream-commit: 94e3b0f4288cdff767817b751e9a318e665ea7ac
Component: engine
2015-09-29 17:40:55 -04:00
ad77115889
Merge pull request #16656 from shishir-a412ed/man_docker_daemon_dns-opt
...
Add dns-opt option to docker daemon man page
Upstream-commit: 724b410c555a278d428929d125005d624d4a94a5
Component: engine
2015-09-29 14:07:43 -07:00
681be8cc45
Vendor in stretchr/testify to fix GCCGO issue with function name parsing
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 81c42d6c1e7df423aa07674a38028abfa9522f51
Component: engine
2015-09-29 19:20:03 +00:00
69db6279aa
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 de4164043546d2b9ee3bf323dbc41f4979c84480, reversing
changes made to 7daeecd42d7bb112bfe01532c8c9a962bb0c7967.
Signed-off-by: Tibor Vass <tibor@docker.com >
Conflicts:
api/server/container.go
builder/internals.go
daemon/container_unix.go
daemon/create.go
Upstream-commit: b08f071e18043abe8ce15f56826d38dd26bedb78
Component: engine
2015-09-29 14:26:51 -04:00
fef14476a9
Revert "Merge pull request #16567 from calavera/context_per_request"
...
This reverts commit ff92f45be49146cd7ac7716c36d89de989cb262e, reversing
changes made to 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c.
Reverting to make the next revert easier.
Signed-off-by: Tibor Vass <tibor@docker.com >
Upstream-commit: 79c31f4b13d331d4011b2975a96dcdeab2036865
Component: engine
2015-09-29 13:40:46 -04:00
1e6abba179
Merge pull request #16570 from duglin/ReaderFix
...
Make Close() on simpleReaderCloser actually close the reader
Upstream-commit: 252af0ae2fe8cd68c527b8c5bf6e3dd1c23d8574
Component: engine
2015-09-29 12:55:03 -04:00
6ba4be05e8
Add dns-opt option to docker daemon man page
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: 8db945abb96b983ef391b3513df38a368708e963
Component: engine
2015-09-29 12:31:51 -04:00
e87759cf33
Merge pull request #16649 from mtrmac/16648-test-text-fixups
...
Fix text not matching the actual tests
Upstream-commit: 4e0eb91c5577a0310366d699fbed3b213e7caa38
Component: engine
2015-09-29 12:01:19 -04:00
ca2ed97d93
Merge pull request #16611 from vdemeester/fix-TestAttachClosedOnContainerStop-racy-test
...
Fix TestAttachClosedOnContainerStop racey test
Upstream-commit: 992e464a80e880930817f7622d1b6a5ff63b1033
Component: engine
2015-09-29 11:49:24 -04:00
2f036a6241
Merge pull request #16641 from cpuguy83/16598_fix_TestExecStartFails
...
Make sure test container is running before exec
Upstream-commit: 499b76d2ecb97ed1e59c732770ccdad6a1c8b3b6
Component: engine
2015-09-29 11:25:14 -04:00
9346a064f4
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 >
Upstream-commit: 50852f3be3d09d8bf6957d2ff27c26966b871e80
Component: engine
2015-09-29 16:57:58 +02:00
5c97861d03
Make sure test container is running before exec
...
Fixes race in TestExecStartFails
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 9077c8968950133fdfac9898a20f9887f8df78f2
Component: engine
2015-09-29 10:06:51 -04:00
4b1e83454e
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 >
Upstream-commit: 8e5bb8fdd37879ec04c3419b8ecfce7a0477cdcf
Component: engine
2015-09-29 10:01:57 -04:00
5950661408
Fix text not matching the actual tests
...
Also fixes a typo in image name.
Fixes #16648
Signed-off-by: Miloslav Trmač <mitr@redhat.com >
Upstream-commit: 8781367c77a915799dff2892f4506f085ac6b68b
Component: engine
2015-09-29 15:26:04 +02:00
1bdb03b312
Merge pull request #16635 from Microsoft/10662-fixtestrununknowncommand
...
TestRunUnknownCommand 30s, not 30ns
Upstream-commit: d6e7350b961d856dcc39db5accd898279d1be3da
Component: engine
2015-09-28 14:31:48 -07:00
1159e2fd1b
Merge pull request #16636 from Microsoft/setrunninglocking
...
Move setRunningLocking to test code
Upstream-commit: 79dd76b6024d834cd7e6bc769dcff8e55fbac59f
Component: engine
2015-09-28 14:25:32 -07:00
e1405c129c
Windows: Fix TestRunStdinBlockedAfterContainerExit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 4d301f0059c4e2e4ecea1ed41f2c1588b8db6990
Component: engine
2015-09-28 14:08:26 -07:00
b5b9cbb133
Merge pull request #16608 from vdemeester/16585-revert-env-regexp
...
Revert environment regexp in opts
Upstream-commit: ab8a4102e1be31b5b6a15b707dba360fb4219ac8
Component: engine
2015-09-28 13:54:17 -07:00
cf83257849
Move setRunningLocking to test code
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: eff253dfaf5f6a18a83df946823049b301931995
Component: engine
2015-09-28 13:48:12 -07:00
2e16748341
TestRunUnknownCommand 30s, not 30ns
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 74aeb0350e8a3cd73646bbfe45cfee8901f0cf28
Component: engine
2015-09-28 13:40:17 -07:00
f3c86e1ecc
Merge pull request #16616 from sunyuan3/TestRunWithSwappinessInvalid
...
Update TestRunWithSwappinessInvalid.
Upstream-commit: 17062aea218c2cc8a03316443d902541247ca95d
Component: engine
2015-09-28 11:42:26 -07:00
6900c89d83
Revert environment regexp from 13694
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 7335544fd062de71454a9cd45ff664e2407206e6
Component: engine
2015-09-28 20:26:20 +02:00
0b0feca4e8
Fix comment typo in attach.go
...
Signed-off-by: Lei Jitang <leijitang@huawei.com >
Upstream-commit: 4e62bd97d37df252213218e5b756ba7da9b1f336
Component: engine
2015-09-28 08:59:40 -04:00
5bf9802e2c
Update TestRunWithSwappinessInvalid.
...
Signed-off-by: Yuan Sun <sunyuan3@huawei.com >
Upstream-commit: 3571814dc508b61d60db894f7634a263b73e3a4e
Component: engine
2015-09-28 18:13:21 +08:00
f935cc47fb
Merge pull request #16229 from icecrime/discovery
...
Add builtin nodes discovery
Upstream-commit: 9324b154d27643caed58c12e8c49630eeceb4fda
Component: engine
2015-09-27 18:06:27 -07:00
71b700b568
Merge pull request #16109 from charleswhchan/patch-3
...
Touch up "Dockerfile reference"
Upstream-commit: 486c12525f27dd51c89cde910c5ea06665824095
Component: engine
2015-09-27 15:12:17 -07:00
d966435345
Merge pull request #16603 from icecrime/add_more_vincent
...
Add @vdemeester to MAINTAINERS
Upstream-commit: 457a066ff043e8c4615addb37c4d0ccb48344db7
Component: engine
2015-09-27 12:14:39 -07:00
2f753b8d99
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 >
Upstream-commit: 60f76bbfe1baaa0c1cc94b997022df6b8c44f07f
Component: engine
2015-09-27 08:04:36 -07:00
1775a6e17a
Merge pull request #16187 from mikebrow/16161-fix-text-in-docker-basics-page
...
cleaning up the first few paragraphs of getting started with containers
Upstream-commit: 1cab5a50d095e25b20e8ec93a13b985909f30f7d
Component: engine
2015-09-27 08:02:14 -07:00
798ccba56f
Merge pull request #16338 from twaugh/env-replacement-label
...
Add documentation note that LABEL allows environment replacement
Upstream-commit: f8f03a290c98063936643c26a0345439a25fe1a7
Component: engine
2015-09-27 08:00:53 -07:00
72834631b5
Sort maintainers by name
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: 6957b671bb65f53b6e03705266e76770d339eec9
Component: engine
2015-09-26 08:11:36 -07:00
b3a26eaa63
Add @vdemeester to MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com >
Upstream-commit: fcb9d8d8992d275bf2718657b6650e7bfed09a33
Component: engine
2015-09-26 08:09:44 -07:00
602b65fbb2
Vendoring in libnetwork with the fix for compilation error using GCCGo (X86 GCCGO CI)
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: ba4c132491b913d050c3fdf72f623b59f3dbb563
Component: engine
2015-09-26 01:37:56 +00:00
c12c647423
Merge pull request #16063 from shishir-a412ed/man_docker_daemon
...
man page for docker daemon command
Upstream-commit: 02eed8d666e1eff4b60e259189f1cdf0c6944e5d
Component: engine
2015-09-25 15:42:06 -07:00
037faa21f6
Merge pull request #16531 from vbatts/vbatts-non-utf8-name-fix
...
vendor: update tar-split to v0.9.10
Upstream-commit: c32d22e6e4e50165f30c2937acdd5a246a6b1791
Component: engine
2015-09-25 17:55:11 -04:00
ff72d92410
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 >
Upstream-commit: 7d193ef1f3b5fcd6aa55b7376116e2617be12e06
Component: engine
2015-09-25 14:52:09 -07:00
5b4d10360b
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 >
Upstream-commit: 166e082be33bcd20bdaa0c69bf934e56f15a8245
Component: engine
2015-09-25 13:33:23 -07:00
51abe1412d
Merge pull request #16589 from mavenugo/ln_vin_ls
...
Vendoring libnetwork and libkv
Upstream-commit: 3c3d232e0af829ab6c98e21eb4de58cae3a289ff
Component: engine
2015-09-25 13:31:14 -07:00
24818bd478
Merge pull request #16590 from Microsoft/10662-escapeargsfix
...
Windows: Flags to cmd are now sent as two separate arguments
Upstream-commit: f0e904df8e840911401b73e2f0a24e16b2eb0305
Component: engine
2015-09-25 13:29:54 -07:00
b31922f0fe
Merge pull request #16567 from calavera/context_per_request
...
Define a context per request.
Upstream-commit: ff92f45be49146cd7ac7716c36d89de989cb262e
Component: engine
2015-09-25 13:01:51 -07:00
