toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
24,532 Commits 3 Branches 295 Tags
eceb2f3e2ed3fc7716930a153eea3f00780f73ca
Commit Graph
24532 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Sven Dowideit 7098114aac docs: update graphdriver compatibility matrix 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: a7bf4e4832c216bdbc9fc678262bcd2c081e914b
Component: engine
 2016-05-25 18:33:45 +00:00
Sven Dowideit abd6ce8179 Add make test and other small cleanups 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: ad538f6465776281550a7e40b59d5eb6f706b777
Component: engine
 2016-05-25 18:30:01 +00:00
Sebastiaan van Stijn 0635a7e10b Merge pull request #22908 from vdemeester/7967-since-before-image-filters 
Add before and since filter to images
Upstream-commit: 0fe4417a3b2c18714303f319224b74ec08674115
Component: engine
 2016-05-25 20:15:23 +02:00
David Calavera e94aa3f2ac Merge pull request #22943 from vdemeester/21769-fix-detach-keys 
Fix escape-keys by preserving input if invalid
Upstream-commit: 60abc96acfeae1985f4f0e9e9b44376b75a235f0
Component: engine
 2016-05-25 09:53:53 -07:00
Vincent Demeester ac5e68234e Merge pull request #22916 from duglin/FixNetTest 
Fix flaky TestApiStatsNetworkStats test
Upstream-commit: 004ce6b57124c1a99348e1447ac9e00a970d1b34
Component: engine
 2016-05-25 18:51:47 +02:00
John Howard 3f005ffe52 Windows: run -it not crash in ISE 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 486a1a03d86a679740d79c2ef5e2a9574342f8c3
Component: engine
 2016-05-25 09:50:18 -07:00
John Howard 5773cc71d1 Error login from non TTY 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 541fba13fcbef5e082e3ce08a14901edce4697b6
Component: engine
 2016-05-25 09:29:50 -07:00
John Howard ecdb255cd3 Merge pull request #22958 from Microsoft/hcs_rpc 
Windows: Use the new HCS RPC API
Upstream-commit: c7ee50308290d56b70933dfd83bd70e3a9df93d5
Component: engine
 2016-05-25 09:25:22 -07:00
Sebastiaan van Stijn 504a2ff9e3 Merge pull request #22953 from Microsoft/jjh/TestRunWorkingDirectory 
Windows: Fix TestRunWorkingDirectory
Upstream-commit: 8c70ab803c49816de8124703db6635e9c5c7ce25
Component: engine
 2016-05-25 17:54:39 +02:00
Brian Goff 558c1d058e Merge pull request #22973 from AkihiroSuda/fix22965IntegrationRace 
Fix a race in pkg/integration.TestChannelBufferTimeout
Upstream-commit: 53e2deb1590c8d0b6bf7c700c630dc432ea772d4
Component: engine
 2016-05-25 11:35:23 -04:00
Sebastiaan van Stijn 6eea85e6f1 Merge pull request #22960 from justincormack/seccompdefnotarm 
Do not run the seccomp tests that use default.json on non x86 architectures
Upstream-commit: 4d376e9cc265c098c7faf03d0e75c1164cbf24e0
Component: engine
 2016-05-25 17:20:16 +02:00
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 9fc37c22c9 Add before and since filter to images 
Add support for two now filter on the `images` command : `before` and
`since`. They work the same as the one on the `ps` command but for
images.

        $ docker images --filter before=myimage
        # display all images older than myimage
        $ docker images --filter since=myimage
        # display all images younger than myimage

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 750e16f57c0121aa8cdad1763f0bb6e54b8c6d75
Component: engine
 2016-05-25 13:49:10 +02: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
John Starks d552c414d4 Windows: work around Go 1.6.2/Nano Server TP5 issue 
This works around golang/go#15286 by explicitly loading shell32.dll at
load time, ensuring that syscall can load it dynamically during process
startup.

Signed-off-by: John Starks <jostarks@microsoft.com>
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fa82c0aa10cfac8c6d5e2446876dc79b2b0c1bf9
Component: engine
 2016-05-25 11:59:28 +02:00
Stefan Scherer dd2618f69b Update golang 1.6.2 for ARM 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: f32ccb080ac382a386cbe33ed1d11048474206c5
Component: engine
 2016-05-25 11:58:48 +02:00
Antonio Murdaca 7fe655caac Upgrade to golang 1.6.2 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 40b21745cc14628fc5336fbacddf092667a70c65
Component: engine
 2016-05-25 11:58:48 +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 a4084df811 Fix a race in pkg/integration.TestChannelBufferTimeout 
Update #22965

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
Upstream-commit: d0d828e292733fa1d5e2d09d7f184be69129e757
Component: engine
 2016-05-25 07:09:38 +00: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
Justin Cormack 4d6727d7fe Do not run the seccomp tests that use default.json on non x86 architectures 
The generated profile that we check in is for amd64 and i386 architectures
and does not work correctly on arm as it is missing required syscalls,
and also specifies the architectures that are supported. It works on
ppc64le at the moment but better to skip the test as it is likely to
break in future.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
Upstream-commit: 75385dc216e784d24535326376352de03eaeb059
Component: engine
 2016-05-24 17:47:30 -07:00
Darren Stahl d8cc018311 Change Docker to use the new HCS RPC API 
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 959c1a52bf11dd6b3e65f10bbaa867bfabba6838
Component: engine
 2016-05-24 16:36:51 -07: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
John Howard f99c99aaac Windows: Fix TestRunWorkingDirectory 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 257494bd0a017cad264609f1a77b9af3ab7f991c
Component: engine
 2016-05-24 15:13:06 -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
Vincent Demeester 565bc9079d Move some container related methods and structs to smaller files 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: fb48bf518bfc200ee9a230a7bedaf640df4e5dae
Component: engine
 2016-05-24 21:31:15 +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