4302c14a64
Merge pull request #16920 from mountkin/fix-attach-test
...
fix the flaws in the test of the attach API
2015-11-13 12:05:22 -08:00
a4acb1db4a
Merge pull request #17615 from WeiZhang555/17404-net-inspect-name
...
Include container names in `network inspect`
2015-11-13 11:54:59 -08:00
42fa8e3128
Merge pull request #17417 from cpuguy83/15815_add_log_file_poller
...
Fallback to file polling for jsonlog reader on err
2015-11-13 11:49:54 -08:00
f49fb07086
Merge pull request #17961 from pidster/add-weave-network-plugin
...
Add Weave Network Plugin to docs/extend/plugins.md
2015-11-13 10:12:58 -08:00
cccf674943
Merge pull request #16873 from coolljt0725/expand_docker_info
...
Add more cgroup config to docker info
2015-11-13 09:37:06 -08:00
c705be8e22
Merge pull request #17955 from twhiteman/issue_17952
...
integration-cli: support remote docker host that uses TLS - fixes #17952
2015-11-13 18:26:32 +01:00
59a341ed2a
Merge pull request #17833 from rhatdan/signals
...
Define all of the signals defined by kill -l
2015-11-13 09:03:51 -08:00
f57073c72b
Add Weave Network Plugin to docs/extend/plugins.md
...
Signed-off-by: pidster <pid@pidster.com>
2015-11-13 10:09:22 +00:00
02bc514fb8
Merge pull request #17912 from thaJeztah/fix-docs-for-docker-logs
...
docs: update supported drivers for docker logs
2015-11-13 07:37:47 +01:00
6c27605df6
Merge pull request #17954 from LK4D4/move_utils_selinux
...
Rename daemon/utils_*.go to selinux
2015-11-12 20:06:21 -05:00
c5a10b1d27
Merge pull request #17941 from s093294/patch-1
...
updated instruction to correct file path
2015-11-12 16:34:18 -08:00
c8399630ca
Merge pull request #17942 from thaJeztah/speedy-boarding
...
Docs: improve caching for make docs
2015-11-12 16:33:41 -08:00
f6a037d474
integration-cli: support remote docker host that uses TLS - fixes #17952
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-11-12 16:16:33 -08:00
f9daecc880
Rename daemon/utils_*.go to selinux
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 15:48:41 -08:00
588fedef4a
Merge pull request #17949 from Microsoft/jjh/cpuweighttp4
...
Windows: TP4 fix cpu weight
2015-11-12 21:13:09 +01:00
318a13b0af
Merge pull request #17948 from LK4D4/splunk_windows
...
Enable Splunk logdriver for windows
2015-11-12 20:44:31 +01:00
812a1c149a
Merge pull request #13959 from Mashimiao/add-support-blkio_weight_device
...
Add support for blkio.weight_device
2015-11-12 20:42:13 +01:00
90eac6b48b
Windows: TP4 fix cpu weight
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-12 11:08:24 -08:00
ef6cb749f0
Merge pull request #17947 from Blaisorblade/patch-1
...
Replace now broken link with a "permalink"
2015-11-12 14:05:44 -05:00
705b50850c
Enable Splunk logdriver for windows
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-12 10:57:21 -08:00
b99b23ba93
Merge pull request #17929 from mqliang/hardCode
...
Removing TODO in pkg/term/windows
2015-11-12 19:56:09 +01:00
6b02876362
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>
2015-11-12 19:17:29 +01:00
8b9856dbd7
Merge pull request #17699 from jfrazelle/update-release-script-to-new-process
...
update release script and release process
2015-11-12 09:51:36 -08:00
ce29a8cc37
Merge pull request #17200 from maaquib/16756-integration-cli-events-test
...
Using checkers assert for integration-cli/docker_cli_events_test.go
2015-11-12 16:43:12 +01:00
fc36475184
Merge pull request #17898 from zelahi/16756-createtest-dockercli
...
changed if else statements to c.Asserts in docker_cli_create_test.go.
2015-11-12 07:37:29 -08:00
06a4e5f981
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>
2015-11-12 16:30:40 +01:00
8cf38b6a8b
Merge pull request #17589 from Microsoft/jjh/refactorprocessconfig
...
Refactor ProcessConfig
2015-11-12 07:28:32 -08:00
eed704f7d9
Merge pull request #17901 from runcom/remove-not-needed-func
...
hack: make.sh: remove not used function
2015-11-12 07:16:43 -08:00
5935867213
updated instruction to correct file path
...
Signed-off-by: Poul Kjeldager Sørensen <pks@ascend.xyz>
Signed-off-by: Poul Kjeldager Sørensen <pks@s-innovations.net>
2015-11-12 16:15:29 +01:00
d1ae13b0b0
Define all of the signals defined by kill -l
...
1) SIGHUP 2) SIGINT 3) SIGQUIT 4) SIGILL 5) SIGTRAP
6) SIGABRT 7) SIGBUS 8) SIGFPE 9) SIGKILL 10) SIGUSR1
11) SIGSEGV 12) SIGUSR2 13) SIGPIPE 14) SIGALRM 15) SIGTERM
16) SIGSTKFLT 17) SIGCHLD 18) SIGCONT 19) SIGSTOP 20) SIGTSTP
21) SIGTTIN 22) SIGTTOU 23) SIGURG 24) SIGXCPU 25) SIGXFSZ
26) SIGVTALRM 27) SIGPROF 28) SIGWINCH 29) SIGIO 30) SIGPWR
31) SIGSYS 34) SIGRTMIN 35) SIGRTMIN+1 36) SIGRTMIN+2 37) SIGRTMIN+3
38) SIGRTMIN+4 39) SIGRTMIN+5 40) SIGRTMIN+6 41) SIGRTMIN+7 42) SIGRTMIN+8
43) SIGRTMIN+9 44) SIGRTMIN+10 45) SIGRTMIN+11 46) SIGRTMIN+12 47) SIGRTMIN+13
48) SIGRTMIN+14 49) SIGRTMIN+15 50) SIGRTMAX-14 51) SIGRTMAX-13 52) SIGRTMAX-12
53) SIGRTMAX-11 54) SIGRTMAX-10 55) SIGRTMAX-9 56) SIGRTMAX-8 57) SIGRTMAX-7
58) SIGRTMAX-6 59) SIGRTMAX-5 60) SIGRTMAX-4 61) SIGRTMAX-3 62) SIGRTMAX-2
63) SIGRTMAX-1 64) SIGRTMAX
This will allow users to specify signals by name. Needed to make docker run --stop-signal
work as defined by systemd.
man systemd
defines the proper way to shutdown a systemd running as pid 1 in a container as
SIGRTMIN+4
Signed-off-by: Dan Walsh <dwalsh@redhat.com>
2015-11-12 09:55:18 -05:00
9c6e3396ef
Merge pull request #17631 from sallyom/docker-login-non-root
...
clarify docker login
2015-11-12 22:39:35 +10:00
f9657819cd
docker-login man/doc add security info
...
Signed-off-by: Sally O'Malley <somalley@redhat.com>
2015-11-12 07:25:35 -05:00
715ddd6ee5
Merge pull request #17938 from thaJeztah/fix-docs-run-reference-link
...
docs: fix link to "run reference"
2015-11-12 22:09:56 +10:00
f2705fa6ed
docs: fix link to "run reference"
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 12:38:46 +01:00
7d783ea5eb
Merge pull request #17934 from sdurrheimer/zsh-completion-run-create-volume-driver
...
Add zsh completion for 'docker {run,create} --volume-driver'
2015-11-12 05:41:41 -05:00
b6899ad56f
Merge pull request #17923 from LK4D4/simple_ckill
...
daemon/kill.go: simplify if statement
2015-11-12 05:36:40 -05:00
644471bac8
kill TODO
...
Signed-off-by: mqliang <mqliang.zju@gmail.com>
2015-11-12 16:41:25 +08:00
8446a5c88b
Add zsh completion for 'docker {run,create} --volume-driver'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-11-12 08:35:32 +01:00
40ed821d2e
Merge pull request #17388 from vikstrous/notary_docs
...
more notary documentation
2015-11-11 20:07:55 -08:00
e869e8aa3d
more notary documentation
...
Signed-off-by: Viktor Stanchev <me@viktorstanchev.com>
2015-11-11 19:56:10 -08:00
2337db8205
Merge pull request #17925 from cpuguy83/fix_locker_unit_tests
...
Use timeouts instead of relying on runtime.GoSched
2015-11-11 18:46:52 -08:00
fd672d5926
Use timeouts instead of relying on runtime.GoSched
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2015-11-11 20:59:07 -05:00
fa7ec908c4
daemon/kill.go: simplify if statement
...
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
2015-11-11 17:19:39 -08:00
87de5fdd59
Merge pull request #17919 from Microsoft/jjh/tp4
...
Windows [TP4] Require build 10586+
2015-11-11 19:36:13 -05:00
5b046c71d8
Merge pull request #17916 from Microsoft/jjh/fix-cp-with-volumes
...
Windows [TP4] Fix docker cp when volumes
2015-11-11 19:35:05 -05:00
6c31b17dfd
Merge pull request #17921 from thaJeztah/thou-shalt-not-use-we
...
Fix find and replace typo in dockerimages
2015-11-12 00:09:46 +00:00
a4b2de674c
Fix find and replace typo in dockerimages
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-11-12 00:52:31 +01:00
b664a8825e
Merge pull request #17918 from anusha-ragunathan/fsMagic
...
Include xfsprogs in build environment.
2015-11-11 15:43:52 -08:00
2910f1101d
Using checkers assert for integration-cli/docker_cli_events_test.go
...
Signed-off-by: Mohammed Aaqib Ansari <maaquib@gmail.com>
2015-11-11 18:12:30 -05:00
122568b314
Windows [TP4] Require build 10586+
...
Signed-off-by: John Howard <jhoward@microsoft.com>
2015-11-11 14:49:14 -08:00
Alexander Morozov