5794a0190d
add labels/env log option for gelf
...
this allows gelf logger to collect extra metadata from containers with
`--log-opt labels=label1,label2 --log-opt env=env1,env2`
Additional log field will be prefixed with `_` as per gelf protocol
https://www.graylog.org/resources/gelf/
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
656cdbb0e9
add env and labels to log context
...
Signed-off-by: Daniel Dao <dqminh@cloudflare.com>
2015-10-12 21:12:46 +02:00
8a71e005b4
Merge pull request #16951 from icecrime/maintainers_rm_fred
...
Remove fredlf from MAINTAINERS
2015-10-12 11:07:50 -07:00
c2d21fa9d3
Remove fredlf from MAINTAINERS
...
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
2015-10-12 10:58:04 -07:00
67034e5003
Merge pull request #16947 from Microsoft/jjh/daemon-broken-on-master
...
Windows: Daemon broken on master
2015-10-12 13:40:02 -04:00
b0cbc02283
Merge pull request #15503 from ibuildthecloud/revert-label
...
Revert "Container don't inherit from image labels"
2015-10-12 10:03:18 -07:00
2d1414e8b0
Merge pull request #16945 from estesp/ocd-on-nonmatching-func-names
...
Correct mismatched function names (UID() and Gid())
2015-10-12 09:15:51 -07:00
bfe252b781
Windows: Daemon broken on master
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-10-12 09:11:19 -07:00
d7177c1224
Merge pull request #16900 from ZJU-SEL/16756-update-pull-local
...
update pull-local#16756
2015-10-12 17:49:10 +02:00
08c5f52d70
Merge pull request #16928 from coolljt0725/fix_16927
...
Fix docker daemon exit immediately after starting without -H option closes #16927
2015-10-12 17:24:42 +02:00
79240b9eaf
Correct mismatched function names (UID() and Gid())
...
All the go-lint work forced any existing "Uid" -> "UID", but seems to
not have the same rules for Gid, so stat package has calls UID() and
Gid().
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-12 10:58:33 -04:00
a9e5cb0efb
Merge pull request #16933 from ZJU-SEL/update-save-load-test-16756
...
update test using c.Assert replace c.Fatal
2015-10-12 09:54:13 -04:00
56ed0a6e8c
Merge pull request #16931 from SvenDowideit/minor-dind-error-msg-nit
...
Missing a single dash in error message
2015-10-12 15:18:45 +02:00
d5830d66e0
update test using c.Assert replace c.Fatal
...
Signed-off-by: Hao Zhang <21521210@zju.edu.cn>
2015-10-12 06:32:21 -04:00
e38767e197
Fix docker daemon exit immediately after starting without -H option closes #16927
...
Signed-off-by: Lei Jitang <leijitang@huawei.com>
2015-10-12 04:49:25 -04:00
4e899d64e0
Missing a single dash in error message
...
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
2015-10-11 22:46:14 -07:00
9273c53d83
Merge pull request #16929 from HuKeping/add-back
...
Comment: add some lines back
2015-10-11 22:12:21 -07:00
a066b94ef0
Comment: add some lines back
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-12 19:34:58 +08:00
32c3b99663
Merge pull request #16930 from duglin/RemoveParam
...
Remove used param on ParseHost
2015-10-11 21:37:03 -07:00
ba973f2d74
Remove used param on ParseHost
...
The first param on opts.ParseHost() wasn't being used for anything.
Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-10-11 20:45:17 -07:00
c45ad0b02d
Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376
...
Default the tcp port to 2376 if tls is on, and 2375 if not
2015-10-11 15:35:04 -07:00
70edf41c06
Merge pull request #16764 from thaJeztah/follow-the-white-rabbit
...
Docs: add Docker version/API version matrix
2015-10-11 15:28:46 -07:00
6e12d9fe62
Merge pull request #16865 from MHBauer/registry-service-refactor
...
refactor away direct references to daemon member
2015-10-11 21:47:58 +02:00
3a24eb2de4
Merge pull request #16618 from abronan/fix_discovery_pkg_readme
...
Fix discovery package README with the right --cluster* flags
2015-10-11 12:05:07 -07:00
ad9706a7c5
Merge pull request #16915 from moxiegirl/testing-hugo-15
...
Enabled GitHub Flavored Markdown
2015-10-12 03:52:11 +10:00
8fee1c2020
Enabled GitHub Flavored Markdown
...
GitHub flavored markdown is now supported for links and images. Also, ran LinkChecker and FileResolver. Yay!
Fixes from Spider check
Output for docker/docker now goes into engine directory
Signed-off-by: Mary Anthony <mary@docker.com>
2015-10-11 07:49:54 -07:00
fb8217ee62
Merge pull request #16889 from cxxly/16756-refactor-docker_cli_wait_test
...
use of checkers on Integration test
2015-10-11 10:12:42 +02:00
19c30447b5
use of checkers on Integration test
...
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update integration-cli/docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
update docker_cli_wait_test.go
part of #16756
Signed-off-by: Xiaoxu Chen <chenxiaoxu14@otcaix.iscas.ac.cn>
2015-10-11 11:31:01 +08:00
dc9dd188cf
update pull-local#16756
...
Signed-off-by: heartlock <21521209@zju.edu.cn>
2015-10-11 09:57:25 +08:00
ed9434c5bb
Merge pull request #12648 from estesp/userns-impl
...
Phase 1 implementation of user namespaces as a remapped container root
2015-10-10 11:38:07 -07:00
ef4b053b90
Merge pull request #16907 from sdurrheimer/zsh-completion-cluster-store-opt
...
Add zsh completion for '--cluster-store-opt'
2015-10-10 10:32:08 -07:00
ec05d93c16
Merge pull request #16800 from duglin/buildCache
...
Add useful info to builder cache logrus.Debug
2015-10-10 17:38:43 +02:00
ae31aa10ab
Add zsh completion for '--cluster-store-opt'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-10-10 16:42:01 +02:00
d46fff7d8f
Merge pull request #16846 from HuKeping/master
...
Use checkers on Integration test when possible
2015-10-10 16:35:17 +02:00
72269acf29
Use checkers on Integration test when possible
...
Signed-off-by: Hu Keping <hukeping@huawei.com>
2015-10-10 21:51:15 +08:00
4920d40093
Add useful info to builder cache logrus.Debug
...
Closes : #16790
Signed-off-by: Doug Davis <dug@us.ibm.com>
2015-10-10 05:53:06 -07:00
faa448e801
Merge pull request #16838 from ZJU-SEL/update-save-load-unix-test
...
update save-load-unix-test
2015-10-10 14:51:18 +02:00
a6bbf16aa1
Merge pull request #16895 from vdemeester/ocd-validate-typo
...
Fix few comments in validate scripts
2015-10-10 12:08:37 +02:00
5f2e0864e4
Merge pull request #16899 from jfrazelle/provide-dates
...
fix depreciation dates
2015-10-10 12:06:34 +02:00
99c247a46a
Merge pull request #16874 from ZJU-SEL/fix-parse-run-volumes
...
fix the error msg of func TestParseRunVolumes
2015-10-10 11:27:08 +02:00
1ce9be346b
Fix few comments in validate scripts
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-10-10 11:21:04 +02:00
8d98b37031
update save-load-unix-test
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 15:16:42 +08:00
8363f2f171
fix the error msg of func TestParseRunVolumes
...
Signed-off-by: xlgao-zju <xlgao@zju.edu.cn>
2015-10-10 14:56:50 +08:00
26701e2d9f
fix depreciation dates
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 20:24:04 -07:00
bf80adeee4
Merge pull request #16894 from diogomonica/renaming-trust-keys
...
Renaming trust keys
2015-10-09 23:20:54 -04:00
e5f7fdccfb
Merge pull request #16788 from stefanberger/apparmor_policy_1.9
...
contrib: Adjustments to AppArmor docker engine policy for docker 1.9
2015-10-09 20:15:06 -07:00
930b27a86b
fix logic because jess is the worst
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 22:21:24 -04:00
a85e6a4d4a
Update integration test userns support with flag name change
...
`--root` is now `--userns-remap`
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 20:52:45 -04:00
ea3afdad61
add test-integration-cli specifics for userns
...
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <acidburn@docker.com>
2015-10-09 20:50:27 -04:00
44e1023a93
Add user namespace enable flag `--userns-remap` in experimental build
...
This adds the capability to turn on user namespace support when using an
experimental build Docker daemon binary using the `--userns-remap` flag.
Also documentation is added to the experimental docs.
Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
2015-10-09 20:50:05 -04:00
Daniel Dao
Michael Crosby
Arnaud Porterie
Phil Estes
Alexander Morozov
John Howard
Antonio Murdaca
Phil Estes
Hao Zhang
Lei Jitang
Sven Dowideit
Hu Keping
Doug Davis
Sebastiaan van Stijn
Vincent Demeester
Sven Dowideit
Mary Anthony
Xiaoxu Chen
heartlock
Steve Durrheimer
Vincent Demeester
xlgao-zju
Jessica Frazelle
Jess Frazelle