docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-16 20:22:36 +03:00
Code Activity
15,703 Commits 12 Branches 296 Tags
cfff66c7bb46b2412840c438c19dda9cef2e9d0a
Commit Graph

1410 Commits

Author SHA1 Message Date
David Calavera
fd9e9a6b5b Propagate unmount events to the external volume drivers. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: d592778f4a75d36745aaffaf73c0775ecd420545
Component: engine
 2015-05-22 16:43:34 -07:00
Arnaud Porterie
e89556546b Mark --volume-driver as experimental 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 4fc37a1ede58153bfa6aa5c9aa0f2903f18d572f
Component: engine
 2015-05-21 20:34:17 -07:00
David Calavera
89782c55eb Volumes refactor and external plugin implementation. 
Signed by all authors:

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Jeff Lindsay <progrium@gmail.com>
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Signed-off-by: Luke Marsden <luke@clusterhq.com>
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 81fa9feb0cdc0773eff99d7393c16271e84aac08
Component: engine
 2015-05-21 20:34:17 -07:00
Qiang Huang
f7e26caad3 Fix test failure when --net none build 
Closes: #13369

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: c0dd8538db070a055150a0da76d093d5d196ab42
Component: engine
 2015-05-22 08:21:09 +08:00
Jessie Frazelle
3c9aadce7f Merge pull request #13386 from icecrime/experimental_suffix_version 
Suffix experimental version / fix warning output
Upstream-commit: 2b8271399e0871efd769a79b7ae43b2f51358a3a
Component: engine
 2015-05-21 17:42:23 -07:00
Arnaud Porterie
b53e996e55 Add suffix to experimental builds version 
Signed-off-by: Arnaud Porterie <arnaud.porterie@docker.com>
Upstream-commit: 78578125ce6c534253d8d60c242d6993c569449e
Component: engine
 2015-05-21 16:27:42 -07:00
Alexander Morozov
522037006a Merge pull request #13387 from cpuguy83/fix_ngroutine_test 
Better checking for LogsFollowGoroutinesWithStdout
Upstream-commit: 7fffcfff32ce6c4379f3b90a1570847b06d75a8c
Component: engine
 2015-05-21 12:31:57 -07:00
Brian Goff
97013d9e36 Better checking for LogsFollowGoroutinesWithStdout 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 2805ff1ecee7cd850a08a00ee9448b54beb4032b
Component: engine
 2015-05-21 14:13:01 -04:00
Doug Davis
aa89cbdb44 Add a 'docker create' + 'docker rm' testcase 
Per @thaJeztah's comment here: https://github.com/docker/docker/pull/13367#issuecomment-104286651
I couldn't find an existing test that covered this.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 012e588a744ce3000d58a7562a1a8291a7fe10ae
Component: engine
 2015-05-21 07:30:51 -07:00
Lei Jitang
986a53d09e Make docker ps --size show virtual size really work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: d0de2b1e2f0939b25c83183f450c71b8309d1d32
Component: engine
 2015-05-21 08:57:11 +08:00
Antonio Murdaca
850c8c5ac2 Merge pull request #13263 from rajdeepd/dry-run-test-2 
TestCase for CpuShares and Cpuset
Upstream-commit: 0fddb6ad7e2505a8c1a2c8273ddc97573256e372
Component: engine
 2015-05-20 23:33:42 +02:00
Alexander Morozov
673769117b Merge pull request #13346 from mrjana/cnm_integ 
Fix network connectivity problem for non-root users
Upstream-commit: dec13cef2a6600f01158668a9a31ba0d976b5f5f
Component: engine
 2015-05-20 12:02:07 -07:00
Rajdeep Dua
56af424158 TestCase for CpuShares and Cpuset 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: ebe344d34b9d708b3634c2e17929cae1abb61ae8
Component: engine
 2015-05-20 11:32:48 -07:00
Alexander Morozov
baf6ea6d24 Merge pull request #13324 from duglin/BadRCOnVersion 
Make version check return 400 instead of 404
Upstream-commit: 53a795378ddb092fc6da8c05ff442f5ed52b7bdb
Component: engine
 2015-05-20 11:13:56 -07:00
Jana Radhakrishnan
6fda96cea6 Fix network connectivity problem for non-root users 
If a container was started with a non-root user the container
may not be able to resolve DNS names because of too restrictive
permission in the /etc/resolv.conf container file. This problem
is in how this file gets created in libnetwork and ths PR
attempts to fix the issue by vendoring in the libnetwork code
with the fix.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: afd901e408d8d4ed00707c545ae985bc637a1979
Component: engine
 2015-05-20 17:51:20 +00:00
Alexander Morozov
7bb1c9e819 Test for two containers in --net=host 
This is test for regression which was encountered during libnetwork
merging.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 7e5902c92d9a01d653a97685376def427e1f0750
Component: engine
 2015-05-20 09:35:28 -07:00
Lorenzo Fontana
e61b33bc5e Removed deleteContainer calls 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
Upstream-commit: 086b514f6afb1eacc0683baa3472c80022f6e7e2
Component: engine
 2015-05-20 08:38:23 +02:00
Jessie Frazelle
03f7a130a4 Merge pull request #13325 from LK4D4/cleanup_mounts 
Fix Put without Get in overlay
Upstream-commit: d29dc0b608f106ed589d25117abbbba3f5157bfe
Component: engine
 2015-05-20 03:11:58 +02:00
Jana Radhakrishnan
13426de5e6 Docker integration with libnetwork 
- Updated Dockerfile to satisfy libnetwork GOPATH requirements.
    - Reworked daemon to allocate network resources using libnetwork.
    - Reworked remove link code to also update network resources in libnetwork.
    - Adjusted the exec driver command population to reflect libnetwork design.
    - Adjusted the exec driver create command steps.
    - Updated a few test cases to reflect the change in design.
    - Removed the dns setup code from docker as resolv.conf is entirely managed
      in libnetwork.
    - Integrated with lxc exec driver.

Signed-off-by: Jana Radhakrishnan <mrjana@docker.com>
Upstream-commit: d18919e304c240df84502cdcc5ed655d92d12d4f
Component: engine
 2015-05-19 22:40:19 +00:00
Jessie Frazelle
f0cacf3e79 Merge pull request #12437 from fmzhen/remove-regex-replace 
Removal of the regex to replace ips
Upstream-commit: 92c869cd12313c8832584c1eb671577d070f8a5b
Component: engine
 2015-05-19 22:59:17 +02:00
Doug Davis
bca5faa4ca Make version check return 400 instead of 404 
Closes: #13321

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 7fcf849749322b3e02ae0305f40e505e83b54e9a
Component: engine
 2015-05-19 11:21:05 -07:00
Alexander Morozov
8911352f54 Fix Put without Get in overlay 
It is called for example on daemon start after crash

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 3916561619d45a3d8ca17dfa467149824111023a
Component: engine
 2015-05-19 09:32:23 -07:00
Mingzhen Feng
2d7bfa2f2c Removal of the regex to replace ips 
Signed-off-by: Mingzhen Feng <fmzhen@zju.edu.cn>
Upstream-commit: 3ab7ceb5d7aaa5fc04af98aae4115201ebae13ee
Component: engine
 2015-05-19 10:15:18 +08:00
Michael Crosby
2b5ebf7133 Merge pull request #13282 from duglin/RemoveBash 
Remove use of 'bash' from our tests
Upstream-commit: aac645ae047601fed1550c9d59d7c8ea978203b0
Component: engine
 2015-05-18 13:06:21 -07:00
Brian Goff
1ea64dbe6e Merge pull request #13279 from hqhq/hq_use_inspectfield 
Use inspectField to simplify code
Upstream-commit: ccf02a9f77be7732f65fe435281cea192e6abcad
Component: engine
 2015-05-18 14:53:37 -04:00
Doug Davis
7232d6b354 Remove use of 'bash' from our tests 
Not 100% sure why our Windows test don't complain about some of these,
I'm guessing it because we have bash as part of some git package, but
either way we really shouldn't require bash to run our tests unless we
really need to - which in these cases we don't

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3b1f73fbcd2ed938c499893f318467f14b63085a
Component: engine
 2015-05-18 11:29:08 -07:00
Michael Crosby
b1c2bb01ee Merge pull request #13280 from runcom/test-clean-from-inspect 
Clean tests from not needed inspect call
Upstream-commit: aca4ae8c90dc4ae87dec720ed58a69bec6dabab6
Component: engine
 2015-05-18 11:06:18 -07:00
Qiang Huang
9e12a52ca0 Use inspectField to simplify code 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: 74f8a4eca4d504867aaea63a35ef1e491d332f74
Component: engine
 2015-05-18 10:06:13 +08:00
Antonio Murdaca
2a80100987 Clean tests from not needed inspect call 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: a268e36719e38b91a4ece84e3fdb742ed36feac3
Component: engine
 2015-05-16 18:12:54 +02:00
Alexander Morozov
c8d066f882 Merge pull request #13237 from ahmetalpbalkan/tag/event 
Introduce daemon event 'tag' upon image tagging
Upstream-commit: b5e932a3bf1e9ba2682f0c3df2cc8fdf51f60229
Component: engine
 2015-05-16 09:05:03 -07:00
Hu Keping
349c8c448e Remove dead code of integration-cli/utils.go 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 35b4ed4d174105bacbd35e3d7a0e506ff2d697b8
Component: engine
 2015-05-16 16:49:55 +08:00
Ahmet Alp Balkan
540e90ab62 Introduce daemon event 'tag' upon image tagging 
Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 1630ed97acc7bc3a08b57ce5acaa3d8e37a24694
Component: engine
 2015-05-15 20:21:59 +00:00
Alexander Morozov
36f868037d Merge pull request #13221 from duglin/ReenableDebug 
add link between -D and --log-level=debug back in
Upstream-commit: 0db7365c66ddebc04c41d9baa7a99091d7f656b9
Component: engine
 2015-05-15 11:45:44 -07:00
Alexander Morozov
eec633b1b4 Merge pull request #13251 from cpuguy83/13233_fix_log_follow_goroutine_check 
Extend sleep/timeout for ngoroutine check
Upstream-commit: 5d2ef30a389239d6f5a3a6d1c43c9567a07569ac
Component: engine
 2015-05-15 08:57:25 -07:00
Brian Goff
74818dcd57 Extend sleep/timeout for ngoroutine check 
In cases where this is failing it's ok to have the test take extra time,
but we don't want it to fail because of some race/performance
differences between systems.
So make the timeout go to 30s and double the sleep time in between
checks so it's not pounding the daemon quite so fast.

Originally I couldn't make this test fail (pre-change), but changed
graphdrivers and saw a failure pretty quickly.
This change seems to smooth that out.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f207322c0a017adcce2da04473626f040e08267c
Component: engine
 2015-05-15 09:54:43 -04:00
David Calavera
5edd0d62d2 Merge pull request #13188 from ahmetalpbalkan/inputs-standard-rfc3339 
Parse input timestamps with standard RFC3339
Upstream-commit: e4855eebf229fa1ebddf254a6c32804425ae8c56
Component: engine
 2015-05-14 16:49:01 -07:00
Alexander Morozov
6d5c4d91dd Merge pull request #13196 from crosbymichael/update-libocntainer-may13 
Update libcontainer to a37b2a4f152e2a1c9de596f54c0
Upstream-commit: b2ad9314a2e9bce481275c8d3c08e5e1b9f04523
Component: engine
 2015-05-14 10:49:25 -07:00
Doug Davis
2095b80959 add link between -D and --log-level=debug back in 
Due to popular demand :-)
See #11965

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: a85ca8b7c40f05f2b6471cc30fb8d5271605c1d1
Component: engine
 2015-05-14 10:29:49 -07:00
Alexander Morozov
8de199cc5a Merge pull request #13087 from duglin/FixNatTest 
Fix random errors in DockerSuite.TestNetworkNat
Upstream-commit: fe6f77df2ca6c6ee463b5eba88b428ed8b99281b
Component: engine
 2015-05-14 08:35:27 -07:00
Brian Goff
59274bcf1f Merge pull request #13202 from duglin/ImportFix 
Fix a regression in `docker import` on error from URL
Upstream-commit: ac81cd1fc36c57b0275992f5e6586728c41dc068
Component: engine
 2015-05-14 10:36:50 -04:00
Doug Davis
703705b500 Fix a regression in docker import on error from URL 
when the daemon can't download the image from a `docker import` the
error message was lost due to 'err' being redefined with a block by
mistake.  This removes the ":" from "... err := " which fixes it.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: 3f4926e49b5f6df00ca09328e990729e00cb1a92
Component: engine
 2015-05-14 06:56:52 -07:00
Ahmet Alp Balkan
c16c9cc586 Parse input timestamps with standard RFC3339 
Fix for #13175.

This change allows user-input timestamps (e.g. to `docker events
--since/--until`  or `docker logs --since` to be parsed using
standard RFC3339Nano layout in Go instead of the layout that parses
all timestamps into fixed-length strings (currently buggy).

User inputs need not to be complying to the internal format
(`RFC3339NanoFixed`) anyway.

Added test case for `events --since/--until` with all possible
timestamp input formats.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 999f464feb5b78e8ecc97625e70f3b1796d0a758
Component: engine
 2015-05-14 07:44:42 +00:00
Sebastiaan van Stijn
ab675e423e Merge pull request #12667 from ibuildthecloud/host-uts 
Add --uts=host to allow sharing the UTS namespace
Upstream-commit: ed257420025772acc38c51b0f018de3ee5564d0f
Component: engine
 2015-05-13 18:30:32 -07:00
Darren Shepherd
dc9bbf77b5 Add --uts=host to allow sharing the UTS namespace 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: f2e5207fc989288ad136d48222df8e7754eb0e9b
Component: engine
 2015-05-13 17:56:32 -07:00
Antonio Murdaca
397dc5614b Merge pull request #13146 from rajdeepd/dry-run-test-1 
Modified Test Case to include check for Memory and MemorySwap
Upstream-commit: b37abf2528c26251e0a4ea30dcfd025d2151deb0
Component: engine
 2015-05-14 01:10:35 +02:00
Alexander Morozov
cd070e7fe0 Merge pull request #13154 from coolljt0725/typo_remove_redundant_dot 
Minor typo: remove redundant dot in error message in runconfig/parse.go
Upstream-commit: 64ea54c0ed3f0daff40402259e3a2566a51cd4fe
Component: engine
 2015-05-13 15:24:01 -07:00
Michael Crosby
2df1795660 Update test for /sys mounting 
Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
Upstream-commit: 677d76cd4aadf7514a3ba4e6761880fc3817f573
Component: engine
 2015-05-13 15:02:53 -07:00
Rajdeep Dua
7a2a7a58a0 Modified Test Case to include check for Memory and MemorySwap 
Signed-off-by: Rajdeep Dua <dua_rajdeep@yahoo.com>
Upstream-commit: 1eea2c589da4a4a3f5bfb83f6acf54af83ff4533
Component: engine
 2015-05-13 13:39:07 -07:00
David Calavera
b9cea2b317 Merge pull request #13155 from coolljt0725/fix_validate_tag_name 
Fix validate tag name. Fix #13149
Upstream-commit: 3da0013ac4c12cacc36dfb8746ed6403e358256f
Component: engine
 2015-05-13 12:03:22 -07:00
Alexander Morozov
c6760c3f88 Merge pull request #13174 from ahmetalpbalkan/TestLogsSince 
integ-cli: Fix race in TestLogsSince
Upstream-commit: 1b678f86b37e836e6f6cf1f58f18fde36672bfce
Component: engine
 2015-05-13 11:35:17 -07:00