ea3c3f33bf
Do not try to cleanupMounts if daemon.repository is empty
...
Signed-off-by: Chun Chen <ramichen@tencent.com >
Upstream-commit: 213a0f9d868db07094f90afa944bd0103f40f629
Component: engine
2015-09-29 11:30:18 +08: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
efd6cb1827
Merge pull request #16637 from Microsoft/10662-TestRunStdinBlockedAfterContainerExit
...
Windows: Fix TestRunStdinBlockedAfterContainerExit
Upstream-commit: b50b928313961b1c7244f2b5d41687bd2d67d037
Component: engine
2015-09-28 14:21:41 -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
2b43903db0
Merge pull request #16631 from coolljt0725/fix_typo
...
Fix comment typo in attach.go
Upstream-commit: 7669670f2d68ac6778e17fbc67e3b60bde2f1169
Component: engine
2015-09-28 09:25:54 -07: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
76ec29542e
Merge pull request #16597 from brahmaroutu/vendor_libnetwork_gccgo_fix
...
Vendoring in libnetwork with the fix for compilation error using GCCG…
Upstream-commit: 2ed0739c7a47f5accfbae0c8cce2a7e6463dbdc6
Component: engine
2015-09-25 21:22:02 -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
23558fce68
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 >
Upstream-commit: ecedb3d81d2453e8375dc8e95f42db64ddc1d605
Component: engine
2015-09-25 14:42:17 -04:00
f5a8f1a6e1
Merge pull request #15916 from mikedougherty/release-flexibility
...
Improve flexibility of release scripts
Upstream-commit: 80e31df3b6fdf6c1fbd6a5d0aceb0a148066508c
Component: engine
2015-09-25 11:26:18 -07:00
fe01f0420f
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 >
Upstream-commit: 6db1592066da48cf9ac619cef7d8d7b3a39db518
Component: engine
2015-09-25 11:00:42 -07:00
1ce3a0aaa7
Merge pull request #16508 from MHBauer/create-refactor
...
refactor create to not expose internal data structures
Upstream-commit: 07cfac3d2dbb30a76760397a1aec050a9709a500
Component: engine
2015-09-25 10:58:56 -07:00
49fc637581
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 >
Upstream-commit: 5aa7c2317a253d88023b6285e50cd660fa351d77
Component: engine
2015-09-25 10:37:53 -07:00
3e73510c1a
Merge pull request #16569 from brahmaroutu/ioutil_hang_gccgo
...
goroutine fairness is not guaranteed causing the hang with GCCGO (x86 GCCGO CI)
Upstream-commit: 7a1dbd17fcab5ca76547d9d77c864f972e2638d3
Component: engine
2015-09-25 10:24:13 -07:00
cd76e33b4f
Merge pull request #16576 from Djelibeybi/rpm-docs
...
Add documentation files
Upstream-commit: 2ecc7290d65b572acedd317b7134683fc9afe70c
Component: engine
2015-09-25 10:16:12 -07:00
f7f326c894
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 >
Upstream-commit: 59a000ec7fc31ef4dedc526ef77e70af24f39585
Component: engine
2015-09-25 10:02:31 -07:00
556d0a0826
refactor create to not expose internal data structures
...
- use existing exposed type
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com >
Upstream-commit: 93bd57b0b21e1a802b80388c8fc034780e3200fc
Component: engine
2015-09-25 09:35:18 -07:00
0e8812cfe7
man page for docker daemon command
...
Signed-off-by: Shishir Mahajan <shishir.mahajan@redhat.com >
Upstream-commit: fada260ad2c39b7d9f27b57e4cf0515aee360856
Component: engine
2015-09-25 10:49:06 -04:00
df6cc87bb6
goroutine fairness is not guaranteed causing the hang with GCCGO
...
Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com >
Upstream-commit: 7c52fcce855e446752b6ad642dd4d6c0d732b8f3
Component: engine
2015-09-25 14:40:16 +00:00
c3cad905fa
Add documentation files including the LICENSE and CHANGELOG.md to the RPM
...
Signed-off-by: Avi Miller <avi.miller@oracle.com >
Upstream-commit: 63e5891e4f9654bc02e113ed0787b6636de3da37
Component: engine
2015-09-25 17:44:11 +10:00
00f3eef978
Merge pull request #16571 from skatsuta/fix-typo-comment-evaluator
...
builder: fix typos in comments
Upstream-commit: 02ae137b1d309729c32110aac6e315e798ba4f0e
Component: engine
2015-09-24 23:44:00 -04:00
e4ec87737f
Merge pull request #16468 from crosbymichael/bump_libcontainer
...
Bump libcontainer to 5765dcd086eb0584c0e2eaff9a3ac97b467a98e6
Upstream-commit: b2b76894a1cf21fda18268d0a69f519dd3cee081
Component: engine
2015-09-24 16:53:28 -07:00
8cec2a263a
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 >
Upstream-commit: 27c76522dea91ec585f0b5f0ae1fec8c255b7b22
Component: engine
2015-09-24 18:44:53 -04:00
cb64a89077
Fix windows cross compile with new netlink
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 7d8b5fc3aa291e1126f43157a26b9b021023d76f
Component: engine
2015-09-24 15:01:03 -07:00
18dfcf4e5a
Update libcontainer to aac9179bbadbf958054ce97ab36
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 189d2c79858d08a4cf3454bd7367989a005a4e3b
Component: engine
2015-09-24 15:00:31 -07:00
80b964fca7
Update CAP_ prefix for new spec format
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: f6064cb42b7016641a4823ebd49032edff54befa
Component: engine
2015-09-24 15:00:30 -07:00
d9f4d6c1cc
Fix netlink dependency with new pkg
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: d0fdc3b5dfa951870f4a7c0a08dea8c1bc68a31b
Component: engine
2015-09-24 15:00:30 -07:00
63decb3521
Bump libcontainer to 08b5415ffa3769ff7c1d2f673f613
...
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 6bd3e6357c77f38edd905491837f31f064c70d08
Component: engine
2015-09-24 15:00:30 -07:00
