p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity
17,391 Commits 2 Branches 295 Tags
85cfba650a443dbd09b87f20cbc6bef554b0804e
Commit Graph

41 Commits

Author SHA1 Message Date
Brian Goff
6e14356132 Don't pass check.C to dockerCmdWithError 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 693ba98cb9118bf15caaabc69ca281c0ce604226
Component: engine
 2015-07-27 14:33:32 -04:00
Tianon Gravi
3dbbf38be7 Fix "docker ps" with no containers regression 
The header row was not being printed when "docker ps" was invoked without containers thanks to the new format support, and we instead received a single blank line.

Signed-off-by: Andrew "Tianon" Page <admwiggin@gmail.com>
Upstream-commit: f57fc03e3b39c225a05edfe217bd7616949d0dd0
Component: engine
 2015-07-23 13:23:24 -07:00
Phil Estes
e60763fbc1 ps --format: Add config.js doc, fix gofmt, add integration tests 
Re-add the docs from @calavera's PR to the moved cli cmd reference docs.
Fix gofmt and vet issues from carried commits
Add integration test for using format with --no-trunc and multi-names
Fix custom_test map order dependency on expected value check
Add docs to reference/commandline/ps.md
Remove "-F" flag option from original carried PR content

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 542b58d8f7a2ff3b78a71b7d2c3145dd79f1fa97
Component: engine
 2015-07-22 12:51:16 -04:00
Vincent Demeester
abe73960d5 Use dockerCmd when possible (#14603) 
- integration-cli/docker_cli_attach_test.go
- integration-cli/docker_cli_attach_unix_test.go
- integration-cli/docker_cli_build_test.go
- integration-cli/docker_cli_build_unix_test.go
- integration-cli/docker_cli_by_digest_test.go
- integration-cli/docker_cli_commit_test.go
- integration-cli/docker_cli_config_test.go
- integration-cli/docker_cli_cp_test.go
- integration-cli/docker_cli_create_test.go
- integration-cli/docker_cli_pause_test.go
- integration-cli/docker_cli_port_test.go
- integration-cli/docker_cli_port_unix_test.go
- integration-cli/docker_cli_proxy_test.go
- integration-cli/docker_cli_ps_test.go
- integration-cli/docker_cli_pull_test.go
- integration-cli/docker_cli_push_test.go

- docker_api_attach_test.go
- docker_api_containers_test.go
- docker_api_events_test.go
- docker_api_exec_resize_test.go
- docker_api_exec_test.go
- docker_api_images_test.go
- docker_api_info_test.go

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 5c295460da2098d971eda28a73b416ff6be62f53
Component: engine
 2015-07-14 21:52:43 +02:00
John Howard
5d5c8a740d Validate status= filter to docker ps 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 7bf26d44b08de167b18257b5ddf5912585c840df
Component: engine
 2015-07-02 16:12:42 -07:00
David Calavera
0fb31101e8 Merge pull request #12838 from fntlnz/test-cmd 
Using dockerCmd when possible
Upstream-commit: 6c42b3947a6ad91fc487ba34fec634e9f5c48aea
Component: engine
 2015-06-02 14:12:22 -07:00
Doug Davis
cc848c594e Add a "Created" state for new containers that haven't been run yet 
Closes #13353

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: dc697b1c9f2bf77b5b78aa871e3f365e333fd253
Component: engine
 2015-05-30 07:48:46 -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
Lorenzo Fontana
15949eba4d Using dockerCmd when possible 
Signed-off-by: Lorenzo Fontana <fontanalorenzo@me.com>
Upstream-commit: a2787469ac45085cc28a56f67b7c0a50bead893f
Component: engine
 2015-05-19 20:33:59 +02:00
Antonio Murdaca
6982f607b4 c.Fatal won't fail and exit test inside a goroutine, errors should be handled outside with a channel 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: 4203230cbbf46238e38099c9073bdcad5f69a63f
Component: engine
 2015-04-29 17:02:22 +02:00
David Mackey
ae74d9f34f trivial: typo cleanup 
Signed-off-by: David Mackey <tdmackey@booleanhaiku.com>
Upstream-commit: 3941623fbc3fa724d61f53121513ffd87d03b61c
Component: engine
 2015-04-27 13:35:08 -07:00
Alexander Morozov
c48fdf0abd Implement teardown removeAllImages 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: a9688cdca5577d6db65d76f38bcbe4c1e6f5994f
Component: engine
 2015-04-24 10:37:21 -07:00
Antonio Murdaca
dd4b0467ca Remove deleteAllContainers call in test 
Signed-off-by: Antonio Murdaca <me@runcom.ninja>
Upstream-commit: ee7a7b07e752c56bbe1b941feb1e4313275d68c2
Component: engine
 2015-04-23 16:32:50 +02:00
Alexander Morozov
1884ef3b9b Use suite for integration-cli 
It prints test name and duration for each test.
Also performs deleteAllContainers after each test.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: dc944ea7e48d11a2906e751d3e61daf08faee054
Component: engine
 2015-04-21 10:28:52 -07:00
Todd Whiteman
cb9c496f89 fix #12188 integration-cli: tests using "sleep" can timeout too early - change to "top" instead 
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 42d47c31367d288c7a9ae3acff635e995254469c
Component: engine
 2015-04-09 10:46:57 -07:00
Liu Hua
adca7cca6d fix up Image-name related issues in docker ps and CI 
This patch include the following fixs:
 - fix image name error when docker ps
 - fix docker events test failure: use the exact image name for filter
 - fix docker build CI test failure due to "docker events" change

Because of change of daemon log behavior. Now we record
the exact Image name as you typed. So docker run -d busybux sh
and docker run -d busybox:latest are not the same in the log.
So it will affect the docker events. So change the related CI

Signed-off-by: Liu Hua <sdu.liu@huawei.com>
Upstream-commit: 645c020f5ab7119cd06d7c6a790e9d99fe1cd309
Component: engine
 2015-04-09 23:03:23 +08:00
Jessica Frazelle
0d1c1d0efa cleanup/fix integration-cli for overlay in overlay 
Signed-off-by: Jessica Frazelle <jess@docker.com>
Upstream-commit: 255b84444a86201995d8f688d71b83822f146c3e
Component: engine
 2015-04-08 16:59:36 -07:00
Arnaud Porterie
a714c4cf33 Merge pull request #12107 from cpuguy83/remove_striptrailingchars 
Remove `stripTrailingCharacters` from tests
Upstream-commit: b9d2ede4d4dc67b97abd0254a9e431aa9c89b932
Component: engine
 2015-04-06 08:46:08 -07:00
Brian Goff
ab9a366f0e Remove stripTrailingCharacters from tests 
This was just an alias to `strings.TrimSpace`

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: 475c65319b4663d630711519e18d0b134c42c7f1
Component: engine
 2015-04-06 09:21:18 -04:00
Todd Whiteman
c1f9e7351f integration-cli: add check for TestPsListContainersSize when no containers are returned 
* when no containers are returned, go test would then aborts with:
  panic: runtime error: index out of range

Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
Upstream-commit: 3e51a8147510fb59d6206fe7310feaebc2d69fbc
Component: engine
 2015-04-02 14:45:52 -07:00
unclejack
1031605b86 integration-cli: make TestPsGroupPortRange fast 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
Upstream-commit: cfa8aaf16f1f3b777851555afc83a1112c4f8879
Component: engine
 2015-04-02 18:26:29 +03:00
Peter Choi
0913f2905d Changed snake case naming to camelCase 
Signed-off-by: Peter Choi <phkchoi89@gmail.com>
Upstream-commit: ae907e7af16136225417242ef5d55d3f6062fb3b
Component: engine
 2015-03-26 15:05:45 -06:00
Darren Shepherd
8370215971 Add more tests for labels on containers 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: 5de1298f41ad0ab0b13c839854d6b2a5354294b8
Component: engine
 2015-03-13 10:02:04 -07:00
Darren Shepherd
58d45ba275 Set labels on container create 
Signed-off-by: Darren Shepherd <darren@rancher.com>
Upstream-commit: abb5e9a0777469e64fe2c7ecfa66ea01083d2071
Component: engine
 2015-03-13 10:02:04 -07:00
Ahmet Alp Balkan
0f72ec16db Better test cleanup with defer 
This fixes a few misuses of `deleteAllContainers()` cleanup
method in integration-cli suite by moving call to the
beginning of the method and guaranteeing their execution
(including panics) with `defer`s.

Also added some forgotten cleanup calls while I'm at it.

Signed-off-by: Ahmet Alp Balkan <ahmetalpbalkan@gmail.com>
Upstream-commit: 70407ce40ca98d763da8472e7ee94b6e8d66912d
Component: engine
 2015-02-20 14:04:36 -08:00
Jessica Frazelle
a1047d5010 fix naming, add a test for port range on docker ps 
Docker-DCO-1.1-Signed-off-by: Jessie Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ba99a73c2fc3050475bd6c066c32dcb557cf6f25
Component: engine
 2015-02-16 11:08:32 -08:00
Alexander Morozov
13f02d612c Test for links names in ps --no-trunc 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 2a3225eb82274d245c25fc6191945dde1f25f668
Component: engine
 2015-02-06 14:05:08 -08:00
Alexander Morozov
915f96f67c Show right tag for container in ps 
Fixes #10599

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: e45deceb462351f841aa077819fdef3166381c50
Component: engine
 2015-02-06 11:32:01 -08:00
Abin Shahab
764888405b Fixes symlink, container size, and kmsg tests 
Changes symlink, container size and kmsg tests to account for lxc driver.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 29ac29a4361e0392979ad6a99341bff174f76967
Component: engine
 2015-01-30 09:30:42 +00:00
Abin Shahab
3d77110890 Adds ipc namespace capability to lxc, and fixes tests. 
This fixes various tests by checking for non zero exit code, accounting for lxc-specific base-diffs, and by removing lxc specific environment vars.
It also adds the --share-ipc option to lxc-start for shared ipc namespaces.
Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Docker-DCO-1.1-Signed-off-by: Abin Shahab <ashahab@altiscale.com> (github: ashahab-altiscale)
Upstream-commit: 3ca5af6b1ab6d1b75e014265e1ad4f5e45960826
Component: engine
 2015-01-21 06:08:00 +00:00
Vincent Batts
fc2be6379b Merge pull request #9985 from jfrazelle/fix-exited-filter-should-not-show-running 
`docker ps --filter exited=status` should not show running containers
Upstream-commit: 3ec695924009421f9b1f79368e9e5b1e3e2ca94f
Component: engine
 2015-01-12 15:09:22 -05:00
Jessica Frazelle
24f7ba3a1f docker ps --filter exited=status should not show running containers 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 81f84023bef5e94dfbcfbb44443bc03707b355c4
Component: engine
 2015-01-08 16:23:54 -08:00
Jessica Frazelle
5b02f75ce3 docker ps --filter status=exited should not require passing -a 
Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: 2639e073b19f526ceecbede9439aed0aba0a4ad8
Component: engine
 2015-01-08 15:37:07 -08:00
Alexandr Morozov
b9029ea913 Fix deadlock in ps exited filter 
Fixes #8909

Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 03ea2166b66632ee7cdd824d7acd87b15c9bccb2
Component: engine
 2014-11-03 10:51:03 -08: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
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
unclejack
16206f937c integcli: lint fixes 
Docker-DCO-1.1-Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com> (github: unclejack)
Upstream-commit: c0e632246d821f3f70ffcf7244cf7a9b336b0344
Component: engine
 2014-10-06 23:15:17 +03:00
Jessica Frazelle
ce150ab801 Filter containers by status. 
A continuation of #7616.
Adds `docker ps --filter=status=(restarting|running|paused|stopped)` option.

Docker-DCO-1.1-Signed-off-by: Jessica Frazelle <jess@docker.com> (github: jfrazelle)
Upstream-commit: ea09f036824aee74112a75ac99579ae4f10251b5
Component: engine
 2014-09-29 20:11:19 -07:00
Alexandr Morozov
7983e51d5c Use prefix naming for ps tests 
Signed-off-by: Alexandr Morozov <lk4d4@docker.com>
Upstream-commit: 00b82fcab6492a853958a3a5f43f95469a60e12f
Component: engine
 2014-09-19 22:11:54 +04:00
Alexandr Morozov
1a0325cec5 Test for docker ps -s 
Signed-off-by: Alexandr Morozov <lk4d4math@gmail.com>
Upstream-commit: 41cbce8c005c201169e13902d62112ced9902928
Component: engine
 2014-09-12 11:45:50 +04:00
Fabio Falci
0085f61a68 Move docker ps test to integration cli 
Docker-DCO-1.1-Signed-off-by: Fabio Falci <fabiofalci@gmail.com> (github: fabiofalci)
Upstream-commit: 261dc5e2f60d8c47c36e719db0ecebd77258847e
Component: engine
 2014-07-18 09:43:40 +01:00