bba768bb09
Allow configurable metadata for Splunk log driver
...
Add support of `tag`, `env` and `labels` for Splunk logging driver.
Removed from message `containerId` as it is the same as `tag`.
Signed-off-by: Denis Gladkikh <denis@gladkikh.email >
Upstream-commit: 26855c780184c528446957bd77821c6f4c74b343
Component: engine
2015-11-12 06:36:51 -08:00
5474215e49
Merge pull request #17806 from albers/fix-17768
...
Fix bash completion on systems where extglob is not set
Upstream-commit: d575d1e0944d5b245b7b21f46015346209f4a70e
Component: engine
2015-11-10 21:32:23 +00:00
7a728fd261
Merge pull request #17732 from Microsoft/sjw/archive_access_time_fix
...
Fixing last access time on Windows to unblock python.
Upstream-commit: 35d9bcdb5778f04b76f781dc56e0668c9383b96c
Component: engine
2015-11-10 13:17:03 -08:00
e2a9504310
Merge pull request #17754 from justincormack/gpg-server
...
Add an alternate gpg server to the documentation for Ubuntu and Debian.
Upstream-commit: 3d23fdaf97fe8c2ad252a8376ca18161eda8a8de
Component: engine
2015-11-10 21:08:56 +00:00
2d895b215b
Merge pull request #17874 from LK4D4/nocheck_nil_map
...
daemon/info.go: remove check for map nilness
Upstream-commit: 5b718bdee288134e9a0cfc12d0ed655a3858747f
Component: engine
2015-11-10 12:52:52 -08:00
a03e5da6fb
Use the SKS port 80 keyserver pool, as it is more reliable than the MIT server
...
Signed-off-by: Justin Cormack <justin@specialbusservice.com >
Upstream-commit: 4fca870212ea11010e9dc5ecc802d076dcc1c683
Component: engine
2015-11-10 20:44:18 +00:00
37b87b6310
Merge pull request #17613 from Microsoft/10662-isolationexecopt
...
Windows: Add default isolation exec driver option
Upstream-commit: d4c4557b1af794c4d7e4a9833b20119c0a4c091c
Component: engine
2015-11-10 19:55:46 +00:00
328de5870b
Windows: Add default isolation exec driver option
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a429ad1e35691fb01f3f80461964030d2197a0eb
Component: engine
2015-11-10 11:39:05 -08:00
ee37d11c5a
Merge pull request #17641 from libopenstorage/plugins-md
...
Add OpenStorage to plugins.md
Upstream-commit: d27e802bc54922b3e4465d7ae2e06074489796c6
Component: engine
2015-11-10 19:21:43 +00:00
d9ef640311
Merge pull request #17778 from tophj-ibm/link-fixes
...
Fixed broken links in docker_remote_api
Upstream-commit: 2f1865ae0e8326e5f4e63a5c11f8e2a29377d087
Component: engine
2015-11-10 19:17:17 +00:00
ee197e71e4
Merge pull request #17821 from HackToday/17820-fix-volume-doc
...
Fixing wrong volume doc format
Upstream-commit: 2aa9d85c92803e7b4918694ac5009597fa3fc34b
Component: engine
2015-11-10 19:03:09 +00:00
9662b3cfe7
Merge pull request #17870 from thaJeztah/fix-advanced-contributing-link
...
Fix broken links in CONTRIBUTING.md
Upstream-commit: 9739aa056e11661a9637d38c588eeac28470dea7
Component: engine
2015-11-10 18:31:09 +00:00
eed9f30045
Merge pull request #17476 from coolljt0725/prevent_connect_to_host
...
Fix connect to host and prevent disconnect from host for host network
Upstream-commit: 470fc94f3856640d1c85c90c62a78396a4d55d66
Component: engine
2015-11-10 09:48:33 -08:00
015026bb0d
daemon/info.go: remove check for map nilness
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 8f311f4d8c80fc33613a0f4ddf723ef1e11b1b17
Component: engine
2015-11-10 09:20:59 -08:00
542df63133
Fix link to installation instructions
...
Fix #17872 :
> The script at https://get.docker.com/ links to https://docs.docker.com/en/latest/installation/ , which gives a 404 error. The correct link is https://docs.docker.com/engine/installation/ .
Signed-off-by: Paolo G. Giarrusso <p.giarrusso@gmail.com >
Upstream-commit: c5f24c7902df5a48258056e799952200f250c5f2
Component: engine
2015-11-10 18:06:58 +01:00
b093321513
Merge pull request #17848 from Microsoft/jjh/tidyconfigstructs2
...
Tidy hostconfig struct
Upstream-commit: a6a3c42b5869d4ef25240223db44fa1527d75346
Component: engine
2015-11-10 08:57:05 -08:00
40d3ab07b8
Merge pull request #17789 from duglin/Issue17781
...
Allow for env vars to have spaces in some cases
Upstream-commit: 014bab03efd67367d13231c08cc43e2e73578824
Component: engine
2015-11-10 08:55:11 -08:00
f8fccbbc8d
Fix broken links in CONTRIBUTING.md
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 850f7841f7e132460be44b9a9c5e5581368c296b
Component: engine
2015-11-10 16:56:31 +01:00
838e5c6fa6
Merge pull request #17857 from sdurrheimer/zsh-completion-stats-all
...
Add zsh completion for 'docker stats --all -a'
Upstream-commit: fb2bae5e162c91175f7cbc654de8e0fd132a0998
Component: engine
2015-11-10 11:06:32 +01:00
5b84049223
Merge pull request #17467 from WeiZhang555/fix-doc
...
fix format of man page
Upstream-commit: 34916dcc4b11b03f5532dacc8c73ef9d0598133e
Component: engine
2015-11-10 09:50:31 +00:00
e9d65a16e5
Add zsh completion for 'docker stats --all -a'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com >
Upstream-commit: ba2a5a420d6adf5ab7cd861d1c263dc8b74c7773
Component: engine
2015-11-10 08:47:46 +01:00
b05f4e5488
Merge pull request #17843 from LK4D4/discovery_refactor
...
Refactoring in daemon/discovery.go
Upstream-commit: 6f2c6111d42f823142fc26bc519417b82ffed56b
Component: engine
2015-11-10 07:34:11 +01:00
9a5f43818f
Merge pull request #17847 from LK4D4/exec_unnec_var
...
Remove unnecessary var block in monitorExec
Upstream-commit: 70579bd558e08fc88c06d8925e0be288692d1eac
Component: engine
2015-11-09 23:32:38 -06:00
be40e84376
Fix man pages
...
Add contents and fix format problem for man pages.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: d790469681b65d55e64750fd18d596db90a541df
Component: engine
2015-11-10 09:33:55 +08:00
6027f5a756
Merge pull request #17279 from someara/articles-chef
...
Documenation update - articles/chef
Upstream-commit: c97ac4daf0f47e66a5a4ca0011722fdbd7efe16a
Component: engine
2015-11-10 00:56:41 +00:00
4e36c60d66
Merge pull request #17844 from anthonydahanne/master
...
Implicitly use swarm:latest
Upstream-commit: 95903ece6043bdd180867cc46548c01d75b53c28
Component: engine
2015-11-09 16:10:19 -08:00
3640b2f4c8
Tidy hostconfig struct
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 51cf074e77020ab45b84c22259488b7a0eddc36a
Component: engine
2015-11-09 15:24:23 -08:00
df0ccc7d18
Refactoring in daemon/discovery.go
...
Replace time.Sleep with time.Tick and remove unnecessary var block.
Use Warn log-level instead of error.
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: d83b5dc1773a1e4e5f35cebf1625435a3f1a1c60
Component: engine
2015-11-09 15:21:27 -08:00
d40820af47
Merge pull request #17838 from calavera/revert_17579
...
Revert "Tidy config/hostconfig structures"
Upstream-commit: fa210a01be7927e8332c20da0770de0d855caf51
Component: engine
2015-11-09 15:21:26 -08:00
3ba5945bba
Remove unnecessary var block in monitorExec
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 445675e8081ae1e911db2ebd57efd51329574cdf
Component: engine
2015-11-09 15:14:20 -08:00
c53c22b70c
Merge pull request #17779 from calavera/fix_dns_regression
...
Use an empty slice as default value for DNS, DNSSearch and DNSOptions.
Upstream-commit: 62b484411e851542cdc05ef36fb287c2245ec70c
Component: engine
2015-11-09 18:07:07 -05:00
04e53e786a
Implicitly use swarm:latest so that master and agent use the same version of swarm
...
Signed-off-by: Anthony Dahanne <anthony.dahanne@gmail.com >
Upstream-commit: 4efe0def0ac2a8b6b74a818d23864f62abfaa521
Component: engine
2015-11-09 15:05:17 -08:00
7523555ae3
Merge pull request #17450 from rhatdan/selinux
...
Fix relabel for SELinux
Upstream-commit: 143f3579b0553b50b03438aef76d908a5d327863
Component: engine
2015-11-09 13:19:28 -08:00
2f262fa249
Merge pull request #17431 from vdemeester/hope-it-does-not-broke-everything-again
...
Another try at dockerversion placeholder for library import
Upstream-commit: 58b270c338e831ac6668a29788c72d202f9fc251
Component: engine
2015-11-09 13:15:50 -08:00
99a2fbf27e
Revert "Tidy config/hostconfig structures"
...
This reverts commit ad5052df234e4f48a93e22694f91fda36bb9e95d.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: 3a1200f9f11a016abd75588fa3812fb5505b2c3a
Component: engine
2015-11-09 15:46:45 -05:00
81b8a4871f
Allow for env vars to have spaces in some cases
...
Closes #17781
This allows for env vars in EXPOSE to be parsed for spaces so that each
"word" is then treated independently instead of as a single word/arg.
Signed-off-by: Doug Davis <dug@us.ibm.com >
Upstream-commit: 6990f8c6162b5b05118ab54f155eb5d86c85f2d4
Component: engine
2015-11-09 12:42:56 -08:00
d0affbc9f8
Merge pull request #17819 from tonistiigi/17766-fix-opq-dot
...
Fix opq whiteouts problems for files with dot prefix
Upstream-commit: 69bc4ebe7a7d05a07929cb2d63f27b4ccf87c905
Component: engine
2015-11-09 11:08:31 -08:00
21f4b9fc72
Fix relabel for SELinux
...
With the changes merged into runc/libcontainer, are now causing
SELinux to attempt a relabel always, even if the user did not
request the relabel.
If the user does not specify Z or z on the volume mount we should
not attempt a relabel.
Signed-off-by: Dan Walsh <dwalsh@redhat.com >
Upstream-commit: d9011b36176d6245bdc25401633c213d73e14ea0
Component: engine
2015-11-09 14:04:57 -05:00
094e7a47db
Merge pull request #17816 from coolljt0725/remove_execdriver_env
...
Remove DOCKER_EXECDRIVER env
Upstream-commit: e509fe604c51cffb480098c4377c60bea1261fb1
Component: engine
2015-11-09 19:59:18 +01:00
3ab3ccd0f9
Merge pull request #17834 from LK4D4/update_runc
...
Update runc to introduce RelabelNeeded function
Upstream-commit: 56c8d4aaeff688ca5dc1f8f4c558d2e0110c3638
Component: engine
2015-11-09 10:58:54 -08:00
d3bbdbd31a
Merge pull request #17775 from vdemeester/16756-integration-cli-checkers-runs-unix
...
Use checker for docker_cli_run_unix_test.go
Upstream-commit: 2786af3add53a4224c5bb7e0cd8e097cad45314f
Component: engine
2015-11-09 10:44:32 -08:00
48001c30bb
dockerversion placeholder for library import
...
- Add a *version* file placeholder.
- Update autogen and builds to use it and an autogen build flag
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 8054a303870b81eebe05e38261c1b68197b68558
Component: engine
2015-11-09 19:32:46 +01:00
829d4787d5
Merge pull request #17810 from cpuguy83/graph_cleanup
...
Graph: Un-export non-externally used functions
Upstream-commit: 0631ec6ca00da93576c215b939583b597ae8c110
Component: engine
2015-11-09 10:30:13 -08:00
17291e75fa
Merge pull request #17829 from albers/completion-stats--all
...
bash completion for `docker stats --all`
Upstream-commit: e1910a8e231f55c92c765c7869bf874a1ca14106
Component: engine
2015-11-09 10:29:33 -08:00
eb1eef5173
Merge pull request #17579 from Microsoft/jjh/tidyconfigstructs
...
Tidy config/hostconfig structures
Upstream-commit: 427dcb7f825830bf66402cdb577dcd520499c1b0
Component: engine
2015-11-09 10:14:58 -08:00
7eead35e44
Update runc to introduce RelabelNeeded function
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 00bcc924fa64b16484beeeabbd2969572d03d30d
Component: engine
2015-11-09 10:03:25 -08:00
0345dce058
Use an empty slice as default value for DNS, DNSSearch and DNSOptions
...
So we don't print those <no value> in the client and we don't fail
executing inspect templates with API field names.
Make sure those fields are initialized as empty slices when
a container is loaded from disk and their values are nil.
Signed-off-by: David Calavera <david.calavera@gmail.com >
Upstream-commit: f1a74a89f89affcfbe311e89aa752b3d551e0340
Component: engine
2015-11-09 12:46:48 -05:00
626bc69479
Refactor exitStatus structure
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 77af7d1067b83cf683745e3f15ce19425beb34e0
Component: engine
2015-11-09 08:26:35 -08:00
4364a664e5
Merge pull request #17089 from Microsoft/10662-ansi
...
Windows: Native ANSI console support
Upstream-commit: 28588efb47bc22c409f14ea4a534a01c53c6e1bd
Component: engine
2015-11-09 08:05:08 -08:00
77d68ba99d
bash completion for docker stats --all
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ee13fc5b2f15ae5b4a8c1a6ee23355e6463e2b48
Component: engine
2015-11-09 16:27:13 +01:00
