a1e14407db
Merge pull request #17971 from narqo/simplify-addr-formating
...
Simplify final address formatting in parser.ParseTCPAddr
Upstream-commit: 1448cd3ec26ba98d4a0d53ff02a987ddab80939d
Component: engine
2015-11-14 08:38:09 +01:00
0179308537
Merge pull request #17211 from endocode/kayrus/docker_fd_https
...
Added possibility to use TLS with systemd socket activation
Upstream-commit: dc136b710b70a51510726576761f7bf9aa2455e2
Component: engine
2015-11-14 08:36:54 +01:00
bab21d6431
Merge pull request #17859 from liusdu/remove-rebundent
...
remove unnecessary logs from daemon
Upstream-commit: 1f53bf90972141bc6f5888fb3520dbc68ff9ed14
Component: engine
2015-11-13 16:45:30 -08:00
c61ecf4a61
Merge pull request #17976 from Microsoft/jjh/store-test-unit
...
Windows: Pass store test-unit
Upstream-commit: 7e0a5398af780669684b3c879542df0cc9126114
Component: engine
2015-11-13 16:26:17 -08:00
0192144f1d
Merge pull request #17503 from mikebrow/fix-for-rmi-id-old-local-repositories
...
putting in support for rmi id for legacy docker.io/name images in loc…
Upstream-commit: 9b307fe369884220fdbd3540562ede9050754e6b
Component: engine
2015-11-13 16:22:30 -08:00
b80faeb568
Merge pull request #17977 from Microsoft/jjh/archivewindowscomment
...
Windows: Fixes comment in archive_windows.go
Upstream-commit: 439633cee63dd77c45348b57b4ec7e1332c6206f
Component: engine
2015-11-13 16:00:14 -08:00
eeed6c7d1f
Merge pull request #17978 from Microsoft/jjh/removevolumecheck
...
Windows: Remove check for volume support
Upstream-commit: 28612c558729a01f6d57d648436913a7055bbc14
Component: engine
2015-11-13 15:59:41 -08:00
040ce59c2f
Merge pull request #17979 from Microsoft/jjh/tidytodowindows
...
Remove 'TODO Windows' unnecessary comment
Upstream-commit: 58244392e5e42bfa13114ff2cec60ef176ec173f
Component: engine
2015-11-13 15:59:06 -08:00
d91b38c0d5
Merge pull request #17877 from aaronlehmann/capped-bytespipe
...
Cap the amount of buffering done by BytesPipe
Upstream-commit: 13963957ebadc663915aed8c61451a93db41c27c
Component: engine
2015-11-14 00:51:11 +02:00
5113a5250e
Merge pull request #17980 from Microsoft/jjh/configuresysinit
...
Remove uncalled configureSysInit
Upstream-commit: 5e2d4aaec22cd09e823ee976202515ac992dec20
Component: engine
2015-11-13 14:30:03 -08:00
aac6b83468
Merge pull request #17090 from duglin/dockerignoreWildcards
...
Support multi-dir wildcards in .dockerignore
Upstream-commit: f5e318a17b8bd3126281add5e82dfb09be5b8f11
Component: engine
2015-11-13 14:29:34 -08:00
8fdcec54ee
Merge pull request #17599 from perhapszzy/master
...
Add line information in the parsed Dockerfile.
Upstream-commit: a5f3ed4801dd48bec96d96f63a1c5099bd75a2a6
Component: engine
2015-11-13 16:53:59 -05:00
775e6c0f07
Support multi-dir wildcards in .dockerignore
...
Closes #13113
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: eddb14a44eb3ca6ba0b5e6906e21d767eba1af86
Component: engine
2015-11-13 13:44:07 -08:00
a0d620ddb8
Remove uncalled configureSysInit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 2648655a4a0aaf41e02dec4064c5b6e68fa7b9fe
Component: engine
2015-11-13 13:43:09 -08:00
0c8ae9b87a
Remove TODO Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 208ad80605e5c8c48f77f1b89b25951767135224
Component: engine
2015-11-13 13:07:27 -08:00
c7ef5afd48
Windows: Remove check for volume support
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 820957198299a9fa7cbb019b2b0d3dc8c3b375d0
Component: engine
2015-11-13 13:02:30 -08:00
a7cde865c9
Windows: Fixes comment
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: e5261d6e4a1e96d4c0fa4b4480042046b695eda1
Component: engine
2015-11-13 12:51:05 -08:00
900e412d74
Add line information in the parsed Dockerfile
...
Signed-off-by: perhapszzy@sina.com <perhapszzy@sina.com >
Upstream-commit: 5b6c4dd3df4d501018268d5c32bf78380923c292
Component: engine
2015-11-13 15:41:12 -05:00
82dda06a38
Windows: Pass store test-unit
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 32b905d90ff133c92bb0dd89207a68c45fc81bbd
Component: engine
2015-11-13 12:39:43 -08:00
d89963cfd4
Merge pull request #16920 from mountkin/fix-attach-test
...
fix the flaws in the test of the attach API
Upstream-commit: 4302c14a647570ec4e037ecacc920e59fdeec41a
Component: engine
2015-11-13 12:05:22 -08:00
3898bf4aaf
Merge pull request #17615 from WeiZhang555/17404-net-inspect-name
...
Include container names in `network inspect`
Upstream-commit: a4acb1db4ae899e5b331b4b2724bda990e6f1371
Component: engine
2015-11-13 11:54:59 -08:00
1a8e0677b9
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
Upstream-commit: 42fa8e31284c76f485bed81ed2e1327d60e5cb13
Component: engine
2015-11-13 11:49:54 -08:00
41bc75b63d
Merge pull request #17961 from pidster/add-weave-network-plugin
...
Add Weave Network Plugin to docs/extend/plugins.md
Upstream-commit: f49fb0708629c175d19c14558b9f9c091c71a291
Component: engine
2015-11-13 10:12:58 -08:00
e628862038
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
Upstream-commit: cccf6749431b5055e01f824f1d479ab517e1f812
Component: engine
2015-11-13 09:37:06 -08:00
e6bfd3b818
Simplify address formating
...
Use `net.JoinHostPort()` which count IPv6 literals in `host`,
instead of relying on `net.ParseIP(host).To4()` side effects.
Signed-off-by: Vladimir Varankin <nek.narqo@gmail.com >
Upstream-commit: 38303597452719fe4942c45a03783a9299235e1b
Component: engine
2015-11-13 20:32:32 +03:00
615bc2a933
Merge pull request #17955 from twhiteman/issue_17952
...
integration-cli: support remote docker host that uses TLS - fixes #17952
Upstream-commit: c705be8e229463caf466c5e6b7df9c9826ac6848
Component: engine
2015-11-13 18:26:32 +01:00
0894666dd3
Merge pull request #17833 from rhatdan/signals
...
Define all of the signals defined by kill -l
Upstream-commit: 59a341ed2a875d3c46325f34abba59facc29f1f9
Component: engine
2015-11-13 09:03:51 -08:00
cf625298ac
Added possibility to use TLS with systemd socket activation
...
Signed-off-by: kayrus <kay.diam@gmail.com >
Upstream-commit: 0f2b3191d9e4f48b1915e2da4acc4f28b0d71494
Component: engine
2015-11-13 17:01:23 +01:00
98eee11b79
Add Weave Network Plugin to docs/extend/plugins.md
...
Signed-off-by: pidster <pid@pidster.com >
Upstream-commit: f57073c72bfb30b083730be0623210ad5381ec58
Component: engine
2015-11-13 10:09:22 +00:00
23764c99f4
Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
...
docs: update supported drivers for docker logs
Upstream-commit: 02bc514fb8f41c8e8815c835241d114a6d6fdbd2
Component: engine
2015-11-13 07:37:47 +01:00
17c34757b2
Merge pull request #17954 from LK4D4/move_utils_selinux
...
Rename daemon/utils_*.go to selinux
Upstream-commit: 6c27605df6af842da3308f2bf4f9d1a987ee6b2e
Component: engine
2015-11-12 20:06:21 -05:00
1ba9d92e95
Merge pull request #17941 from s093294/patch-1
...
updated instruction to correct file path
Upstream-commit: c5a10b1d2702937042e36e062016e1b5a868ad3c
Component: engine
2015-11-12 16:34:18 -08:00
1f5e02cdda
Merge pull request #17942 from thaJeztah/speedy-boarding
...
Docs: improve caching for make docs
Upstream-commit: c8399630ca5c85ab3020a3d621e11f536d9ac6ee
Component: engine
2015-11-12 16:33:41 -08:00
4b23698828
integration-cli: support remote docker host that uses TLS - fixes #17952
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com >
Upstream-commit: f6a037d474d87cfa2a66bb0292c34ebc9e0bb275
Component: engine
2015-11-12 16:16:33 -08:00
ec49c2f481
Rename daemon/utils_*.go to selinux
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: f9daecc880f371cf652fd64095d65f0fe35fb2f7
Component: engine
2015-11-12 15:48:41 -08:00
32490eabee
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
Upstream-commit: 588fedef4af1550f631a71ef1bd98998bc031613
Component: engine
2015-11-12 21:13:09 +01:00
442b6c9f86
Merge pull request #17948 from LK4D4/splunk_windows
...
Enable Splunk logdriver for windows
Upstream-commit: 318a13b0afbfe652c7b6de660caa6bbbf884e95d
Component: engine
2015-11-12 20:44:31 +01:00
c0d8796b26
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
Upstream-commit: 812a1c149a4a6db09eb59af29bed2713821e696e
Component: engine
2015-11-12 20:42:13 +01:00
95bf21f468
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 90eac6b48baac2b74b4721456fee4b3f2a0527b8
Component: engine
2015-11-12 11:08:24 -08:00
49104b66a5
Merge pull request #17947 from Blaisorblade/patch-1
...
Replace now broken link with a "permalink"
Upstream-commit: ef6cb749f0788813717c5f8522713dcdbeaa1915
Component: engine
2015-11-12 14:05:44 -05:00
95e4808678
Enable Splunk logdriver for windows
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 705b50850c47e44d82fb40b7f86ddb56a43c20f4
Component: engine
2015-11-12 10:57:21 -08:00
cbcccc4a34
Merge pull request #17929 from mqliang/hardCode
...
Removing TODO in pkg/term/windows
Upstream-commit: b99b23ba93d5f9f9eda97c020274994173419c88
Component: engine
2015-11-12 19:56:09 +01:00
06f47a5302
Replace now broken link with a "permalink"
...
Fix #17927 .
Instead of pointing to a file in Docker's GitHub repo on `master`
(which got renamed, breaking the link), point to a specific version
(the current latest). As a bonus, we now highlight the most
relevant lines, without becoming more fragile.
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: 6b02876362680a1acd2c0fb1fdd85183cee03f20
Component: engine
2015-11-12 19:17:29 +01:00
971f161db1
Cap the amount of buffering done by BytesPipe
...
Turn BytesPipe's Read and Write functions into blocking, goroutine-safe
functions. Add a CloseWithError function to propagate an error code to
the Read function.
Adjust tests to work with the blocking Read and Write functions.
Remove BufReader, since now its users can use BytesPipe directly.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 64f8ee444d23ae29a236f169f1d7faf7042b524a
Component: engine
2015-11-12 10:11:29 -08:00
d41faf6fe1
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
Upstream-commit: 8b9856dbd7a1981aaa76fcf0fc10b37d1141c9af
Component: engine
2015-11-12 09:51:36 -08:00
df454e9cb4
Merge pull request #17200 from maaquib/16756-integration-cli-events-test
...
Using checkers assert for integration-cli/docker_cli_events_test.go
Upstream-commit: ce29a8cc377f9918b71975ffaaa0c314d9977149
Component: engine
2015-11-12 16:43:12 +01:00
7ed1e0b2fb
Merge pull request #17898 from zelahi/16756-createtest-dockercli
...
changed if else statements to c.Asserts in docker_cli_create_test.go.
Upstream-commit: fc364751840e2e54e358d0b46efc9790c6fd9d19
Component: engine
2015-11-12 07:37:29 -08:00
d26ed08b21
Docs: improve caching for make docs
...
Use caching for all other repositories, instead
of doing a svn checkout each time.
This may result in showing outdated docs
for other repositories, but --no-cache can be
used if the latest docs are needed.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 06a4e5f9815d55a91b17cc1eb6556bf029057ec6
Component: engine
2015-11-12 16:30:40 +01:00
c1e130b932
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
Upstream-commit: 8cf38b6a8b031bd0d39d80d0a1d1b6e860a43acb
Component: engine
2015-11-12 07:28:32 -08:00
374d554d86
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
Upstream-commit: eed704f7d933364e68cf29bcd4ed0e3591fd4b6b
Component: engine
2015-11-12 07:16:43 -08:00
