toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,350 Commits 3 Branches 295 Tags
ddcc4a0981bed3c063cc83647b85b38deb2bb456
Commit Graph
24350 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Brian Goff ddcc4a0981 Merge pull request #22969 from AkihiroSuda/fix22963LogRace 
Fix a race in daemon/logger.TestCopier
Upstream-commit: a41e823c1bcbaafca1081dd23a7af3fa25ac946f
Component: engine
 2016-05-25 11:09:51 -04:00
Brian Goff 38a1e359da Merge pull request #22966 from AkihiroSuda/fix22964MemRace 
Fix a race in pkg/discovery/memory
Upstream-commit: cef4ea0b9759386800aae27d6fa92c80d4465745
Component: engine
 2016-05-25 10:58:31 -04:00
Vincent Demeester e0c1ae90e0 Merge pull request #22968 from mbentley/fix-dm-docs 
Fixed lost thin pool devicemapper docs
Upstream-commit: 5bd6067b85cdaa80cfbd43648f9b0a57e1cf58b9
Component: engine
 2016-05-25 16:40:52 +02:00
Matt Bentley e79985ff9b Re-apply changes made in 24ec73f 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 0b8ea4387a3b1e415a49b9c6dbead858891a5ce9
Component: engine
 2016-05-25 08:46:39 -04:00
Matt Bentley 0f6a9d4e70 Fix thin pool devicemapper docs overwritten 
Signed-off-by: Matt Bentley <matt.bentley@docker.com>
Upstream-commit: 79205c3f061c4b690a459cb2b08b6a7df7af327c
Component: engine
 2016-05-25 08:45:51 -04:00
Vincent Demeester 3e8a3ed291 Merge pull request #22962 from normalfaults/b 
fixed spelling error in windows.go
Upstream-commit: 2a4b4a813342294a6191425caba471a94c8a39f6
Component: engine
 2016-05-25 12:21:08 +02:00
Sebastiaan van Stijn 5912cc64b5 Merge pull request #22952 from tophj-ibm/multiarch_daemon_test_fix 
Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon
Upstream-commit: cd159fba8529efe70ea634842a024560dbfd3aec
Component: engine
 2016-05-25 10:19:41 +02:00
Lei Jitang d11b12b133 Merge pull request #22974 from albers/completion-ps-filters 
bash completion for `docker ps -f {before,since}`
Upstream-commit: 5383824e08a58aa83c6ac018706569345fa9e3ea
Component: engine
 2016-05-25 16:05:04 +08:00
Vincent Demeester a953a5531b Merge pull request #22967 from srinsriv/master 
Update dind
Upstream-commit: 522698dd43e1f55b3df8a83b6b11f107a519ab84
Component: engine
 2016-05-25 09:55:10 +02:00
Harald Albers 0de35f39e7 bash completion for docker ps -f {before,since} 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: c49d3274067055dc830d97f1490a84aa73e403e6
Component: engine
 2016-05-25 09:35:33 +02:00
Vincent Demeester 182fa21ebc Merge pull request #22408 from yongtang/21976-allow-dns-and-net-host 
The option --dns and --net=host should not be mutually exclusive.
Upstream-commit: 9f5a2c6e33bf30479f172bbc297bed7316f01855
Component: engine
 2016-05-25 09:11:26 +02:00
Akihiro Suda 1c46623429 Fix a race in daemon/logger.TestCopier 
Update #22963

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: ab533f06510a14a023c056604f9520741073acd3
Component: engine
 2016-05-25 05:07:24 +00:00
Akihiro Suda 3b8abc6850 Fix a race in pkg/discovery/memory 
Fix #22964

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 1f8fbbc0d830ad9a887d04a25152ea344688903b
Component: engine
 2016-05-25 04:01:43 +00:00
srinsriv 966dbfdb11 Update dind 
Typo

Signed-off-by: Srinivasan Srivatsan <srinivasan.srivatsan@hpe.com>
Upstream-commit: 27afaf3774d7f46028ab72192d4c1b65f8d88b87
Component: engine
 2016-05-24 20:42:28 -07:00
Yong Tang b520646fdd The option --add-host and --net=host should not be mutually exclusive. 
This fix tries to address the issue raised in #21976 and allows
the options of `--add-host` and `--net=host` to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 90bd41a74d57080711678bffa2bc4371020ee3a5
Component: engine
 2016-05-24 18:49:11 -07:00
Nirmal Mehta b39fa693a7 Merge branch 'master' into b 
Upstream-commit: 59bb86a964c38d0f2cc724c686803472bb48968b
Component: engine
 2016-05-24 21:43:45 -04:00
Nirmal Mehta 3d16c1ca14 fixed spelling error in docker cli run test 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: f91acbaee452191f406d31e3f3fd44210aa17fbf
Component: engine
 2016-05-24 21:43:22 -04:00
Nirmal Mehta b5619754dc fixed spelling error in windows.go 
Signed-off-by: Nirmal Mehta <nirmalkmehta@gmail.com>
Upstream-commit: 36a9151b27168076073770142d0b354f0e83fdb2
Component: engine
 2016-05-24 21:40:08 -04:00
Yong Tang e230ff1485 The option --dns, --dns-search, --dns-opt and --net=host should not be mutually exclusive. 
This fix tries to address the issue raised in #21976 and allows
the options of `--dns`, `--dns-search`, `--dns-opt` and `--net=host`
to work at the same time.

The documentation has been updated and additional tests have been
added to cover this change.

This fix fixes #21976.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 23821fe5867427fa36c265bc994b1a2c3cf9b21f
Component: engine
 2016-05-24 16:03:26 -07:00
Brian Goff 6373766983 Merge pull request #22925 from jstarks/fix_integration_test 
pkg/integration: Port tests to Windows
Upstream-commit: 29dbcbad878483d9239d6a432c85620aced895c4
Component: engine
 2016-05-24 17:31:43 -04:00
Christopher Jones 2e5b933fb0 Multi-arch: fix TestBuildOnDisabledBridgeNetworkDaemon 
Fixes the test by loading in the architecture specific busybox
image when the test daemon starts.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
Upstream-commit: 7832e2ae82ae56e9719c6930b054f643285a79b3
Component: engine
 2016-05-24 16:33:49 -04:00
Phil Estes 2453234b4d Merge pull request #22922 from justincormack/ppc64le-seccomp 
Enable seccomp on ppc64le
Upstream-commit: bdc06cf8f8f4868186e3a843482afed48361cc09
Component: engine
 2016-05-24 16:08:50 -04:00
Michael Crosby d767f40c10 Merge pull request #22948 from dmcgowan/remove-unused-overlay-mounted 
Remove unused mounted function in overlay
Upstream-commit: 0802401d22790ec85a620ac1c1ee41f81025c4a8
Component: engine
 2016-05-24 13:08:06 -07:00
Vincent Demeester 12513175c8 Merge pull request #22091 from amitkris/build_solaris 
Get the Docker Engine to build clean on Solaris
Upstream-commit: 86a7632d63bdddb95aaf1472648056a4fb737d38
Component: engine
 2016-05-24 21:41:36 +02:00
John Starks 866c631581 pkg/integration: Port tests to Windows 
Signed-off-by: John Starks <jostarks@microsoft.com>
Upstream-commit: 8fc825364ac60848d4278c00429838c3f28f2cd7
Component: engine
 2016-05-24 12:12:48 -07:00
Sebastiaan van Stijn 0f8f43b91e Merge pull request #22935 from thaJeztah/add-justin-to-maintainers 
Add Justin Cormack to maintainers
Upstream-commit: 48a53d2e8c4db73c85c90c748d2f323ab458e8b9
Component: engine
 2016-05-24 20:23:52 +02:00
Derek McGowan 1bdae7f37d Remove unused mounted function in overlay 
The mount check is now done by the FSChecker. This function is no longer needed and shouldn't be called.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 5cc082473068b00dee123f8388a79d7a48842a57
Component: engine
 2016-05-24 11:02:07 -07:00
Alexander Morozov 0ec1e0058a Merge pull request #22932 from chenchun/fix_build 
Fix building image  error if bridge network is disabled
Upstream-commit: 38217d43531c721da952a9de2a89b08397f7c029
Component: engine
 2016-05-24 10:33:34 -07:00
Vincent Demeester eaeb1bdc9d Merge pull request #22756 from wangxing1517/fix_docs_dockerd.md 
Fix incorrectly named "ip-mask" and "api-cors-headers" options
Upstream-commit: f0d6fd93a2b2cbe4ad177524ca52018dae2fcce7
Component: engine
 2016-05-24 18:21:52 +02:00
Sebastiaan van Stijn 6f4700f12d Merge pull request #22941 from AkihiroSuda/fix22940 
Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack
Upstream-commit: f10a222de1cc756bb14d157b778d820fac3561aa
Component: engine
 2016-05-24 18:13:44 +02:00
Sebastiaan van Stijn 3185dc9996 Merge pull request #22264 from aaronlehmann/updated-image-spec 
Update image specification for content-addressability changes
Upstream-commit: 7faa2a40bcfc2c8600a6895d09235081730d6f46
Component: engine
 2016-05-24 18:06:52 +02:00
Vincent Demeester df65461ecd Merge pull request #22945 from albers/completion-daemon-events 
bash completion for daemon events
Upstream-commit: 1dc87a6f9fb1a28613f4937267055fad37893d03
Component: engine
 2016-05-24 17:30:18 +02:00
Harald Albers 2e9725c51d bash completion for daemon events 
Signed-off-by: Harald Albers <github@albersweb.de>
Upstream-commit: cc6a1b8bb3849f2ead3f89fc18a573034e1386f1
Component: engine
 2016-05-24 17:19:03 +02:00
Vincent Demeester 6696b4b541 Merge pull request #22906 from nshalman/patch-1 
Clarification about 'docker build --build-arg'
Upstream-commit: ce07eac570e90ed8aa69472bae463902c075e078
Component: engine
 2016-05-24 15:33:27 +02:00
Nahum Shalman 2332228518 Clarification about 'docker build --build-arg' 
See #22860

Signed-off-by: Nahum Shalman <nshalman@omniti.com>
Upstream-commit: fd7d99ed283bea260fa5e674ee8200038196fdac
Component: engine
 2016-05-24 09:25:11 -04:00
Vincent Demeester df271497b6 Merge pull request #22900 from AkihiroSuda/fix22020 
update docs/reference/commandline/cp.md
Upstream-commit: 6a385a00226dc7d8a35406ae284bb6731444d524
Component: engine
 2016-05-24 14:06:02 +02:00
Akihiro Suda bda8efbc36 Fix a race in cmd/dockerd/hack.TestHeaderOverrideHack 
Fix #22940

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: 1670914b8a56ab8e6ead38739fddb416b61e444f
Component: engine
 2016-05-24 11:29:55 +00:00
Akihiro Suda 4e2b010c12 update docs/reference/commandline/cp.md 
Close #22020

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: cb1635c9cf4813c95a1c72dd35b13e8acebfbfb6
Component: engine
 2016-05-24 11:09:38 +00:00
Sebastiaan van Stijn f5925d0f50 Add Justin Cormack to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Upstream-commit: e427e4b108e9219316a56f72219a6fee93088da0
Component: engine
 2016-05-24 11:09:39 +02:00
Vincent Demeester 850246a4c4 Merge pull request #22590 from yongtang/22463-docker-daemon-events 
Emit events for docker daemon
Upstream-commit: d76d38c7d028754c48f842e4631c2d897e63198d
Component: engine
 2016-05-24 11:05:39 +02:00
Chun Chen 6717a252a9 Fix building image error if bridge network is disabled 
Signed-off-by: Chun Chen <ramichen@tencent.com>
Upstream-commit: a8d013495c479cdc18fa7751413ef67334f37ee6
Component: engine
 2016-05-24 16:20:26 +08:00
Vincent Demeester da14c60e92 Merge pull request #22928 from friism/patch-3 
remove duplicated text
Upstream-commit: bf7bae9662a2de9cdb689ac813c503fe1157d6da
Component: engine
 2016-05-24 08:38:40 +02:00
Alexander Morozov d6f4430048 Merge pull request #22541 from crosbymichael/graph-restore 
Implement graph driver restore on reboot
Upstream-commit: d7dfe9103bfc275494d936a5d89f3067b0aedbc9
Component: engine
 2016-05-23 22:57:23 -07:00
Justin Cormack 36a2f2d0be Enable seccomp on ppc64le 
In order to do this, allow the socketcall syscall in the default
seccomp profile. This is a multiplexing syscall for the socket
operations, which is becoming obsolete gradually, but it is used
in some architectures. libseccomp has special handling for it for
x86 where it is common, so we did not need it in the profile,
but does not have any handling for ppc64le. It turns out that the
Debian images we use for tests do use the socketcall, while the
newer images such as Ubuntu 16.04 do not. Enabling this does no
harm as we allow all the socket operations anyway, and we allow
the similar ipc call for similar reasons already.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: a83cedddc6d3e0fe1df352ec54245090df641ab8
Component: engine
 2016-05-23 22:35:55 -07:00
Tõnis Tiigi e2f2261834 Merge pull request #22926 from justincormack/seccomp-test 
Fix error channel size in seccomp test
Upstream-commit: a5aba7752a9716cde55e94705048407bed17374f
Component: engine
 2016-05-23 22:28:24 -07:00
Michael Friis b1cf67eeb6 remove duplicated text 
Signed-off-by: Michael Friis <friism@gmail.com>
Upstream-commit: 5271a69411e93a2b694c84f7f8216f0d91404e07
Component: engine
 2016-05-23 19:01:30 -07:00
Yong Tang fe4d79b993 Add filter for events emitted by docker daemon 
This fix tries to cover the issue raised in #22463 by adding
filter for events emitted by docker daemon so that user could
utilize filter to receive events of interest.

Documentations have been updated for this fix.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 62014aaf9abeb4256cb66e7ae06bfdf5a77d1140
Component: engine
 2016-05-23 19:00:47 -07:00
Yong Tang e954a0d7e9 Emit events for docker daemon 
This fix tries to cover the issue raised in #22463 by emitting
events for docker daemon so that user could be notified by
scenarios like config reload, etc.

This fix adds the `daemon reload`, and events for docker daemon.

Additional tests have been added to cover the changes in this fix.

This fix fixes #22463.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 382c152a73dfa1d771334ffbe79759c5c3596144
Component: engine
 2016-05-23 19:00:47 -07:00
Justin Cormack f066a59cec Fix error channel size in seccomp test 
This was not changed when the additional tests were added.
It may be the reason for occasional test failures.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 3598f2e33198686f0afa08aca640dbda8697fcb2
Component: engine
 2016-05-23 18:14:55 -07:00
Brian Goff 26b03e34e3 Merge pull request #22919 from LK4D4/carry_22754 
cli: remove unnecessary initErr type
Upstream-commit: 9bc6c4ef80d8f7178c5b085bea83a5919e3abae1
Component: engine
 2016-05-23 20:21:08 -04:00