p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
11,181 Commits 2 Branches 295 Tags
e695413b13cd91ee5f833ea7142f560d998fa0b3
Commit Graph

475 Commits

Author SHA1 Message Date
Victor Vieux
49dfc3aa46 Merge pull request #8573 from estesp/integration-test-migrate 
Migrate container GET API tests from integration to integration-cli
Upstream-commit: a10876d35520df10b9a10feb941ffe6922844782
Component: engine
 2014-10-20 18:06:40 -07:00
Brian Goff
94f641a2fe Make container.Copy support volumes 
Fixes #1992

Right now when you `docker cp` a path which is in a volume, the cp
itself works, however you end up getting files that are in the
container's fs rather than the files in the volume (which is not in the
container's fs).
This makes it so when you `docker cp` a path that is in a volume it
follows the volume to the real path on the host.

archive.go has been modified so that when you do `docker cp mydata:/foo
.`, and /foo is the volume, the outputed folder is called "foo" instead
of the volume ID (because we are telling it to tar up
`/var/lib/docker/vfs/dir/<some id>` and not "foo", but the user would be
expecting "foo", not the ID

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ef98fe0763024abd90bd5a573fec816895ee92e4
Component: engine
 2014-10-20 20:23:01 -04:00
Tibor Vass
fdb40707dc Merge pull request #8638 from LK4D4/fix_8632 
Don't write pull output to stdout on container creating
Upstream-commit: af52f8edcf7a4a1b9eaf39d11165e5d3d9457df4
Component: engine
 2014-10-20 18:10:47 -04:00
Alexandr Morozov
6e31e9c7ee Merge pull request #8543 from brahmaroutu/filter_containers_7599 
Adding capability to filter by name, id or status to list containers api
Upstream-commit: 52784c09b726846a5d404720989a36e0664155cb
Component: engine
 2014-10-20 15:04:24 -07:00
Michael Crosby
41862f8f56 Merge pull request #8511 from coolljt0725/fix_tag 
Fix tag an existed tag name of a repository
Upstream-commit: b90ab68f2a10e3f1e7a3568e7338afc89cbd00bc
Component: engine
 2014-10-20 14:32:23 -07:00
Srini Brahmaroutu
d5e9b821af Adding capability to filter by name, id or status to list containers api 
Closes #7599

Signed-off-by: Srini Brahmaroutu <srbrahma@us.ibm.com>
Upstream-commit: 16346253537267b42bbf35e81c0139b4d0aee43c
Component: engine
 2014-10-20 18:33:20 +00:00
Lei Jitang
621ba20f0e Add docker tag tests. 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: c496f24157afd81c9a26f5746175236485e97fa7
Component: engine
 2014-10-20 11:10:31 +08:00
Doug Davis
86ec0544b5 Add a testcase to make sure we don't squash tabs or convert them to spaces 
This is in response to @SvenDowideit asking if we had a "tab" testcase
in https://github.com/docker/docker/issues/2315#issuecomment-58133508
I couldn't find one so I'm adding one

Closes #2315

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: c980fe09b77700fcaf47459e91a149876b7abef9
Component: engine
 2014-10-17 15:52:48 -07:00
Alexandr Morozov
98837c45ee Merge pull request #8639 from erikh/fix_escapes 
builder: fix escaping for ENV variables.
Upstream-commit: 75fd1b614dfd5acd36975357b51341585f89003c
Component: engine
 2014-10-17 15:50:37 -07:00
Erik Hollensbe
6ef784efe2 builder: fix escaping for ENV variables. 
Docker-DCO-1.1-Signed-off-by: Erik Hollensbe <github@hollensbe.org> (github: erikh)
Upstream-commit: df0e0c76831bed08cf5e08ac9a1abebf6739da23
Component: engine
 2014-10-17 21:47:35 +00:00
Jessie Frazelle
2e9533ccba Merge pull request #8415 from LK4D4/use_logs_in_builder 
Use logs instead of attach for builder
Upstream-commit: 3c325f89e544415bafc23006ead0bdc21cab2f61
Component: engine
 2014-10-17 13:32:13 -07:00
Alexandr Morozov
1ccc013586 Use logs instead of attach for builder 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6f09d064bd438ab4425d6105f40887f02bb9e97e
Component: engine
 2014-10-17 13:20:02 -07:00
Alexandr Morozov
1cb2cc041f Just remove integration-cli/build_tests/TestCopy/MultipleFilesToFile because it wasn't used 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 93d3c8e71d0ca8f33d905c455c0520c423fd7eb9
Component: engine
 2014-10-17 11:58:12 -07:00
Alexandr Morozov
810883724d Rewrite TestBuildCopyDisallowRemote to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 98e7608b4cec04463781ccb314259873bbb56a16
Component: engine
 2014-10-17 11:58:12 -07:00
Alexandr Morozov
50718a9b0f Rewrite TestBuildCopyEtcToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: c8a5d56fd789b50b78ad58c07a535aaf01af77f7
Component: engine
 2014-10-17 11:57:48 -07:00
Alexandr Morozov
7e037f1bad Rewrite TestBuildCopyWholeDirToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 6582ea574cfcd6cc8e3b1abebe7bfcc7aee05ece
Component: engine
 2014-10-17 11:57:30 -07:00
Alexandr Morozov
5ab35b8993 Rewrite TestBuildCopyDirContentToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 4a029259ff41c37eb72a6f221f9725f66491139f
Component: engine
 2014-10-17 11:57:07 -07:00
Alexandr Morozov
3100829c7e Rewrite TestBuildCopyDirContentToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 832618afc6e6a8c489afb40f94340f158f9680c7
Component: engine
 2014-10-17 11:56:49 -07:00
Alexandr Morozov
ff7999247d Rewrite TestBuildCopySingleFileToNonExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 24d83afd5203f93a22a3d95a212e9ec295aadc8b
Component: engine
 2014-10-17 11:56:28 -07:00
Alexandr Morozov
f2d974c957 Rewrite TestBuildCopySingleFileToExistDir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 2248109ff8607264ba40d4a4ac24bad66462d105
Component: engine
 2014-10-17 11:56:01 -07:00
Alexandr Morozov
e5897b7fab Rewrite TestBuildCopySingleFileToWorkdir to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: d41cba6aed1ffdda9c3e3441d720dab9afc3eb66
Component: engine
 2014-10-17 11:55:34 -07:00
Alexandr Morozov
be8f5dfa14 Rewrite TestBuildCopySingleFileToRoot to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 83c5dced10c4e2a40990e927ccc15a1e0428529c
Component: engine
 2014-10-17 11:55:04 -07:00
Alexandr Morozov
fa31328c73 Rewrite TestBuildCopyAddMultipleFiles to not use fixtures 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: e45c92153d0c21308fe5983aa76182cc03ef398e
Component: engine
 2014-10-17 11:54:29 -07:00
Jessie Frazelle
02f8c7b8a5 Merge pull request #8567 from LK4D4/add_log_done 
Add logDone for TestBuildAddSingleFileToNonExistDir
Upstream-commit: 5a20dc67b005717a0549fe504a3b0ccf62c913c6
Component: engine
 2014-10-17 11:20:12 -07:00
Jessie Frazelle
2cbac498ba Merge pull request #8486 from duglin/Issue5701 
Add failing testcase for single quotes in CMD
Upstream-commit: 09ceae5c9c268f2b79954b1580c5ec1632f24d0e
Component: engine
 2014-10-17 11:11:49 -07:00
Alexandr Morozov
c9c863328e Don't write pull output to stdout on container creating 
Fixes #8632

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: ad136e1ae3175bd30c87ccbde8e31f0e422ff5ec
Component: engine
 2014-10-17 11:08:53 -07:00
Jessica Frazelle
bbf89a9e7f Cleanup errorOut remove errorOut functions 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 5af7facf18565100d52fa198a695ab98a9669825
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
99346a8e5f Cleanup errorOut resp run tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 66ac7420a90c832bacd0cb1832bf934b5420a311
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
168d6b41a8 Cleanup errorOut resp log tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 842d4b6b0afb0380afeea6d1638edb8913ae70bd
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
c587404dc5 Cleanup errorOut resp restart tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 9f52d8e6e786e62aa63b06d26782120fd25daf31
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
a8a998eeed Cleanup errorOut resp exec tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6f1c8ff4c4fd1f001917c3af89907731561642a6
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
2c526d9f92 Cleanup errorOut resp pull tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: eeb009729430f0858f56be37011325f3f9486386
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
960bb7c8ed Cleanup errorOut resp in images tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: dd248dee3c889fe376a89adcc9f9d19cafb9bf69
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
77ef164c1f Cleanup errorOut resp in version tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 50c3e7537c055a73a71999cb3ae9f2c6aa57efce
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
029dd9ca6c Cleanup errorOut resp in push tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f013506aad8b7c09b3c2d3307dadfa4b2d365d40
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
7e76a1cfb9 Cleanup errorOut resp in top tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 764030ec92f8cf8b47079c26d7c1393bd963fbf4
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
a1fc81a541 Cleanup errorOut resp in build tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b1e3c9e9cd49591f8efcbcd00d45bcd98fbe2831
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
c9b622420d Cleanup errorOut resp in save tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0c87424007aa1220842acca26cbadc7c1a05bef9
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
d073e74963 Cleanup errorOut resp in rmi tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0e3744ec8958faf88026338dcb096198399059e8
Component: engine
 2014-10-16 15:06:20 -07:00
Jessica Frazelle
6c78c54dea Cleanup errorOut resp in inspect tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac24cabd9d05fe8843a382bb55fe5f2dcd4b9da2
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
e1b85a8d45 Cleanup errorOut resp in ps tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: d33f2bdb114a9fd3c1413dbd4667440153df9431
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
2a8b0f0a3a Cleanup errorOut resp in search tests 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ef787eb824896471485522d343c62a6edb5c947f
Component: engine
 2014-10-16 15:06:19 -07:00
Jessica Frazelle
0fb5fb3bb6 Cleanup errorOut resp in docker_utils.go 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 73eadbc6a1af80dfb1e933644a9a2927004e6d0f
Component: engine
 2014-10-16 15:06:16 -07:00
Jessica Frazelle
198fd58622 Cleanup errorOut resp in diff test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ac62c5439ac6197c3afca66db4489f96296097b6
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
c635846b4b Cleanup errorOut resp in links test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 7d38ae7041357e58edee5c26f721e39be9ff1fbd
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
043dfeea4f Cleanup errorOut resp in history test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: f7b3a6b292a1f8dc7cfffe2e93622ea2c3419623
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
d97b62dff0 Cleanup errorOut resp in info test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: b59d5a9dd2e0e474f04ce4eb31de41a1484d97bf
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
3fda727482 Cleanup errorOut resp in kill test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 0faf87598f19bd3520704ed18209afbbe6a6ee90
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
6e0d79bbf4 Cleanup errorOut resp in nat test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 17842840ec0fc7a0b66050b97692250b74d91372
Component: engine
 2014-10-16 15:05:00 -07:00
Jessica Frazelle
fb004016c8 Cleanup errorOut resp in create test 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 6b858b59ed6e1f594e5552e3f5e8f46351466d78
Component: engine
 2014-10-16 15:05:00 -07:00