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
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
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
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
a273d038b8
Merge pull request #16228 from duglin/ContextualizeEvents
...
Add context.RequestID to event stream
Upstream-commit: de4164043546d2b9ee3bf323dbc41f4979c84480
Component: engine
2015-09-24 14:16:22 -07:00
3f746aee10
Merge pull request #16559 from Microsoft/10662-fix16556
...
Fixes 16556 CI failures
Upstream-commit: 7daeecd42d7bb112bfe01532c8c9a962bb0c7967
Component: engine
2015-09-24 12:31:36 -07:00
58c0f4ebe8
Merge pull request #14579 from hqhq/hq_add_softlimit
...
Add support for memory reservation
Upstream-commit: 84b53c8d87c0ab887209a51e54fad60a591e737a
Component: engine
2015-09-24 12:11:36 -07:00
6b0fc15891
Merge pull request #16511 from Mashimiao/fix-logic-client-search
...
client/search: small logic fix
Upstream-commit: a7e8f3616cc97bd5fb59d6074ab78219b81d1f12
Component: engine
2015-09-24 15:06:10 -04:00
bf44c732da
Add context.RequestID to event stream
...
This PR adds a "request ID" to each event generated, the 'docker events'
stream now looks like this:
```
2015-09-10T15:02:50.000000000-07:00 [reqid: c01e3534ddca] de7c5d4ca927253cf4e978ee9c4545161e406e9b5a14617efb52c658b249174a: (from ubuntu) create
```
Note the `[reqID: c01e3534ddca]` part, that's new.
Each HTTP request will generate its own unique ID. So, if you do a
`docker build` you'll see a series of events all with the same reqID.
This allow for log processing tools to determine which events are all related
to the same http request.
I didn't propigate the context to all possible funcs in the daemon,
I decided to just do the ones that needed it in order to get the reqID
into the events. I'd like to have people review this direction first, and
if we're ok with it then I'll make sure we're consistent about when
we pass around the context - IOW, make sure that all funcs at the same level
have a context passed in even if they don't call the log funcs - this will
ensure we're consistent w/o passing it around for all calls unnecessarily.
ping @icecrime @calavera @crosbymichael
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 26b1064967d9fcefd4c35f60e96bf6d7c9a3b5f8
Component: engine
2015-09-24 11:56:37 -07:00
65bd47ac3a
Merge pull request #15862 from calavera/share_shm_and_mqueue
...
Share shm and mqueue between containers.
Upstream-commit: 23750fb80280e6770590b0ea30781c43f42e430d
Component: engine
2015-09-24 11:23:59 -07:00
60a1c405c1
Fixes 16556 CI failures
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e65a7dabb9632b30df9c67ca5783d6dd55e91a7b
Component: engine
2015-09-24 11:19:00 -07:00
ea22c47211
Merge pull request #16538 from Microsoft/10662-escapeargs
...
Windows: Fixed escaping of command line arguments
Upstream-commit: c8bc02ea35775b048cc84a9c10d6284675f3b297
Component: engine
2015-09-24 11:18:29 -07:00
6444463820
Merge pull request #16507 from azurezk/testcase_nit
...
TestInspectInt64 to be neat
Upstream-commit: ccba7c3e1417724183d6537a3ec27f6c5bed7e6a
Component: engine
2015-09-24 11:12:43 -07:00
247b98190f
Merge pull request #16480 from sunyuan3/TestRunWithKernelMemory
...
update TestRunWithKernelMemory
Upstream-commit: f2db5028cd5b74afc856fd303e9450e50975f93a
Component: engine
2015-09-24 11:10:51 -07:00
9180d03f46
Merge pull request #16556 from Microsoft/10662-randomunix
...
Make 'TestRandomUnixTmpDirPath' platform agnostic
Upstream-commit: de8b5c46ccabf00ce869d3b2a526c32d044653a7
Component: engine
2015-09-24 10:35:27 -07:00
426a4c8843
Merge pull request #16541 from sunyuan3/newlogformat
...
Update documentation for new test log format
Upstream-commit: f75206dd7b4f3cb91399a0f465c096402d89eb50
Component: engine
2015-09-24 10:07:20 -07:00
0577a33a45
builder: fix typos in comments
...
Signed-off-by: Soshi Katsuta <soshi.katsuta@gmail.com >
Upstream-commit: 53e5f33279c6f21cfd9e8366d240124e62f8a11a
Component: engine
2015-09-25 01:45:59 +09:00
a894b3819f
Merge pull request #16545 from HuKeping/fixtest
...
Fix test for container events
Upstream-commit: 1e514de2e413fb01ceac36fa222a4334b854991d
Component: engine
2015-09-24 12:43:51 -04:00
b5fd27f53c
TestRandomUnixTmpDirPath platform agnostic
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 5d630abbab734d60cc3078fd1e94862a67e0d8fd
Component: engine
2015-09-24 09:37:07 -07:00
fcffa49e7d
Fix test for container events
...
Signed-off-by: Hu Keping <hukeping@huawei.com >
Upstream-commit: 5505bcdd628de4a45781609bdc10d203aab77834
Component: engine
2015-09-24 19:04:54 +08:00
3a638e5279
Merge pull request #16190 from LK4D4/drain_refactor
...
Refactoring of bufReader
Upstream-commit: 8c33c6c737c887f05c0dfc1eb7f1002d16250f69
Component: engine
2015-09-24 01:54:40 -07:00
88a3d0ed92
client/search: small logic fix
...
Signed-off-by: Ma Shimiao <mashimiao.fnst@cn.fujitsu.com >
Upstream-commit: 19613feddf0043756a42a1766abde33a47c346dc
Component: engine
2015-09-24 11:11:03 +08:00
d9099289b8
test neat
...
Signed-off-by: Kun Zhang <zkazure@gmail.com >
Upstream-commit: 029c6eacd6fa2970b5a8dea0acc0deecf1efbf5b
Component: engine
2015-09-24 10:55:47 +08:00
moxiegirl
Arnaud Porterie
Charles Chan
Srini Brahmaroutu
Tibor Vass
Jess Frazelle
David Calavera
Vincent Batts
Madhu Venugopal
Alexandre Beslic
Darren Stahl
Morgan Bauer
Shishir Mahajan
Avi Miller
Doug Davis
Michael Crosby
Phil Estes
Doug Davis
John Howard
Soshi Katsuta
Hu Keping
Ma Shimiao
Kun Zhang