docker/cli
1
0
Fork 0
mirror of https://github.com/docker/cli.git synced 2026-01-18 08:21:31 +03:00
Code Activity
19,409 Commits 12 Branches 296 Tags
f17dd37fef8dcac1b02c58aadbf7fc91622fcea2
Commit Graph

19409 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Alexander Morozov
f17dd37fef Use json.Encoder for container.toDisk 
* for simmetry with fromDisk
* it might be slightly better for GC because of internal sync.Pool

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: cf02b369e077022335f01b2f78ebd759129de82a
Component: engine
 2015-10-30 09:29:53 -07:00
Brian Goff
0adc841955 Merge pull request #17385 from aditirajagopal/16756-upgrade_commit_test 
Checkers on integration-cli/docker_cli_commit_test
Upstream-commit: 2c6351a4a51d1090658c55b33fbbec28c635c97b
Component: engine
 2015-10-30 10:36:41 -04:00
Vincent Demeester
f0f0d423c9 Merge pull request #17427 from zelahi/16756-dockercli-killtest 
modified docker_cli_kill_test.go to use c.Asserts 
Upstream-commit: 0598ff46ac0d4e485ff8109f9d287990d5d54256
Component: engine
 2015-10-30 12:56:52 +01:00
Antonio Murdaca
3b3b529e21 Merge pull request #17425 from wenchma/16756-docker_cli_attach_unix_test 
Using checkers assert for integration-cli/docker_cli_attach_unix_test.go
Upstream-commit: 77488b90c5dbc4d3e5237aa856fdd042ff8d9f42
Component: engine
 2015-10-30 12:41:14 +01:00
Antonio Murdaca
8365d94d5b Merge pull request #17510 from LK4D4/refactor_shutdown 
Refactor Shutdown a little to reduce indentation
Upstream-commit: e990eca1e5b73c4e87f2e3b18f52f3d9630a988b
Component: engine
 2015-10-30 12:24:03 +01:00
Sebastiaan van Stijn
7426ed02e4 Merge pull request #17365 from HuKeping/rework-history 
Rework docker cli history
Upstream-commit: 855487b37926f64ad456c430fb4eb51606d5b256
Component: engine
 2015-10-30 10:33:16 +01:00
Antonio Murdaca
c4945bb6f2 Merge pull request #17498 from LK4D4/fix_graph_comment 
Fix Graph() docstring
Upstream-commit: 6b9de7342ff79d9dbf889dd2d66a9b7dc6523c28
Component: engine
 2015-10-30 09:48:16 +01:00
Vincent Demeester
fbb8ea7720 Merge pull request #17492 from aidanhs/aphs-remove-dead-code 
Remove dead code
Upstream-commit: 81c5b1ce4a5db623b04b5cce254b4e2ef7ef2c5b
Component: engine
 2015-10-30 08:50:54 +01:00
Vincent Demeester
4244ff4dbb Merge pull request #17463 from dongluochen/volumeRouter 
extract docker volume API from local
Upstream-commit: 4f3dd3db5abc5a6044ce6eb1a762bb9e7d327b1f
Component: engine
 2015-10-30 08:33:43 +01:00
Aditi Rajagopal
82ce818530 Checkers on integration-cli/docker_cli_commit_test 
Applying #16756 to integration-cli/docker_cli_commit_test.go

Signed-off-by: Aditi Rajagopal <arajagopal@us.ibm.com>
Upstream-commit: 483abbb313a35696a9c1b7ff72407b0a0118a22b
Component: engine
 2015-10-29 21:47:54 -05:00
Tianon Gravi
6dfffa67e6 Merge pull request #17512 from jfrazelle/update-go-deb-rpm 
update go version for debs and rpms
Upstream-commit: 1795eb9545011699feef2d2497ab23ef18664398
Component: engine
 2015-10-29 18:56:06 -07:00
Tibor Vass
45a710ef4e Merge pull request #17504 from calavera/default_network_driver 
Let the api to choose the default network driver.
Upstream-commit: d7bdbdf564d58b6f5d47c8114b720c96eaee80df
Component: engine
 2015-10-29 20:37:21 -04:00
Alexander Morozov
9e7bc2e568 Refactor Shutdown a little to reduce indentation 
Also make daemon.netController.Stop() regardless of container existance.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ace5854f654d58e821bb3d47c4e3255ae49619e5
Component: engine
 2015-10-29 17:20:32 -07:00
Jessica Frazelle
5502018bf5 update go version for debs and rpms 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 985fe8857d6670e5a484237a8c8ccdde66a39013
Component: engine
 2015-10-29 17:04:38 -07:00
David Calavera
961ca9c736 Let the api to choose the default network driver. 
That way swarm can understand the user's intention.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 34668ad68bb42d7488649e41b32818f3f1a7cff2
Component: engine
 2015-10-29 19:47:12 -04:00
Brian Goff
631571fcc6 Merge pull request #17497 from LK4D4/put_err 
Do not ignore errors from graphdriver.Put
Upstream-commit: 82203d06ebbd7e205cf620c2e8555914f3c86d8f
Component: engine
 2015-10-29 19:37:10 -04:00
Brian Goff
db9e9ee3c5 Merge pull request #17228 from ecnahc515/patch-1 
cliconfig: Do not rely on platform dependent code
Upstream-commit: 6c80fd24687bed12b394e35cc59742e75a19376a
Component: engine
 2015-10-29 19:29:38 -04:00
Jess Frazelle
ff7c252b26 Merge pull request #17491 from LK4D4/seq_tests 
Run unit tests as single command
Upstream-commit: d30caedbf8860b0cc07aa2429ca20dafb5e918e2
Component: engine
 2015-10-29 16:29:24 -07:00
David Calavera
d7b7b49b51 Merge pull request #17499 from jfrazelle/fix-lxc-tests 
lxc does not support exec
Upstream-commit: 2eaa25d3554dbe9f6d5c4f66a97c8eb83a463880
Component: engine
 2015-10-29 15:08:13 -07:00
Alexander Morozov
f8757c11b0 Merge pull request #17490 from aboch/pm 
Libnetwork vendoring & overlay networking fixes
Upstream-commit: 7f7950aa187e551bdc4d6128523207c2b8343250
Component: engine
 2015-10-29 13:45:19 -07:00
David Calavera
27424c56e7 Merge pull request #17460 from dmcgowan/fix-rmi-force-tag 
Fix rmi -f removing multiple tags
Upstream-commit: cdfd9846f480b54dc6207b578c29ecfe2cdeed34
Component: engine
 2015-10-29 13:01:06 -07:00
Jessica Frazelle
6cae6d09ea lxc does not support exec 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: aaa134ea0e12781c7e1f19562544826274263a4b
Component: engine
 2015-10-29 11:51:59 -07:00
Alessandro Boch
a94cd37485 Execute buildPortMapInfo after Endpoint.Join() 
- As the retrieved info may not be available at
  Endpoint creation time for certain network drivers
- Also retrieve the MAC address from Endpoint.Info().Iface()

Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: e03daebb48221bae84bfc48b0f9b652ced6d93f3
Component: engine
 2015-10-29 11:47:30 -07:00
Alexander Morozov
35f2f24931 Fix Graph() docstring 
It's not true anymore, it used in builder for example.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 134772f91ec40616d974e61388638495c8a126fb
Component: engine
 2015-10-29 11:41:42 -07:00
Alexander Morozov
b276a5731c Do not ignore errors from graphdriver.Put 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: ac4b2905528457d9dba252c1590b9ac143372d0b
Component: engine
 2015-10-29 11:25:53 -07:00
Brian Goff
09de1db703 Merge pull request #17488 from jfrazelle/skip-windows-test 
cant run volume on windows w remote daemon host
Upstream-commit: 8d62f243c725c6eba43ca59ef17407e43004a238
Component: engine
 2015-10-29 13:37:39 -04:00
Aidan Hobson Sayers
0b3d47d91e Remove dead code 
Signed-off-by: Aidan Hobson Sayers <aidanhs@cantab.net>
Upstream-commit: 164d0bca63b74e6e0deeceee17b55c044f8d274e
Component: engine
 2015-10-29 16:56:29 +00:00
Alexander Morozov
691e7791f8 Run unit tests as single command 
For me it increased speed of unit-tests tremendously, however this disabled
coverage profiles generation, which I think is pretty good tradeoff.

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 1c23de0e64887f6c36b2156dd65717f723493775
Component: engine
 2015-10-29 09:39:51 -07:00
Alessandro Boch
4a8db513f4 Vendoring libnetwork 20351a84241aa1278493d74492db947336989be6 
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: 90744fe9432d988bae187a8dab7c606b2dc13895
Component: engine
 2015-10-29 09:24:48 -07:00
Jessica Frazelle
7fc5a670bb cant run volume on windows 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 1a6a860c143487b96b8a6221768a73ed4cef6d7b
Component: engine
 2015-10-29 08:55:48 -07:00
Wen Cheng Ma
c41fca36c1 Using checkers assert for integration-cli/docker_cli_attach_unix_test.go 
Fixes part of #16756

Signed-off-by: Wen Cheng Ma <wenchma@cn.ibm.com>
Upstream-commit: f4abc6406e5837cee33763b6784b89578045d4db
Component: engine
 2015-10-29 21:38:00 +08:00
Hu Keping
45e2cb6b92 Rework docker cli history 
The implementation of `history` is a little redundant espacially
when user set the `--human` and/or `--no-trunc` options.

There are too many conditionals for `human`, `no-trunc` and `quiet` which
I think is useless and complicated.

Since `quiet` will only display the container IDs so it could be not
nested with the other options.

Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 09eedc35b2e309c4b9489e21a623ad72179a8ded
Component: engine
 2015-10-29 17:59:07 +08:00
Jess Frazelle
d488544828 Merge pull request #17471 from jfrazelle/fix-userns 
fix experimental tests
Upstream-commit: 8e144e6c5090572176af3dec07424cefba1cbcc1
Component: engine
 2015-10-29 00:10:08 -07:00
Jessica Frazelle
58647231c1 fix experimental tests 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 44da86172aeb750d0ac46c000e32e51a12411ecd
Component: engine
 2015-10-28 21:14:45 -07:00
Jess Frazelle
b2d6b2b0d2 Merge pull request #17462 from LK4D4/fix_device_tool 
Fix docker-device-tool
Upstream-commit: 965706245b702c08d23ce7da2e91440ccec74726
Component: engine
 2015-10-28 18:56:54 -07:00
David Calavera
b0c9467783 Merge pull request #17437 from LK4D4/put_error 
Do not ignore error from driver.Put
Upstream-commit: 0e1618db194388e7fe54332a7e192eb41ad9df89
Component: engine
 2015-10-28 17:32:03 -07:00
Alexander Morozov
7a5788a9d4 Fix docker-device-tool 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 584bdaf5d92d1f8beda602493c90c389d6b82b47
Component: engine
 2015-10-28 16:43:53 -07:00
David Calavera
26f967025f Merge pull request #17458 from LK4D4/unnec_err 
Remove unnecessary error returns
Upstream-commit: 7de2b49ac86cf92fd2af34f671503118c3cc8b16
Component: engine
 2015-10-28 16:25:40 -07:00
Derek McGowan
4cf9c8be78 Fix rmi -f removing multiple tags 
When an image has multiple tags and rmi is called with force on a tag, only the single tag should be removed.
The current behavior is broken and removes all tags and the image.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 48e7f7963e142a0a45b583c5e65015d896c59433
Component: engine
 2015-10-28 16:07:02 -07:00
Doug Davis
0317f9b3fb Merge pull request #16898 from hqhq/hq_bump_bolt 
Bump bolt to v1.1.0
Upstream-commit: b6e1f4dd69a865df847dd4f6efe12df21f5c34dd
Component: engine
 2015-10-28 18:51:23 -04:00
Alexander Morozov
a0d60ea3e8 Remove unnecessary error returns 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: 990655448dec63ef8add376becb1a20ae184a162
Component: engine
 2015-10-28 15:15:22 -07:00
David Calavera
b5b91966d7 Merge pull request #17424 from coolljt0725/fix_inspect_gateway_value 
Fix docker inspect display odd gateway value for none network mode
Upstream-commit: 54d42f4a107641c2755ea1d6e55ca41d8945f4f8
Component: engine
 2015-10-28 13:39:59 -07:00
David Calavera
17a203e45b Merge pull request #17445 from tiborvass/fix-docker-py 
docker-py: upgrade and fix test script
Upstream-commit: 2fb442f145813d5b66bdea558c422ced8d1fe8c2
Component: engine
 2015-10-28 11:16:41 -07:00
Tibor Vass
b78e8b7756 docker-py: upgrade and fix test script 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 8db141049f5323d754584f265b267e52ee5d9e17
Component: engine
 2015-10-28 12:56:50 -04:00
Alexander Morozov
552e02ae16 Do not ignore error from driver.Put 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
Upstream-commit: bc09eceaf401893275b6ec5508d523ec39357d78
Component: engine
 2015-10-28 06:54:09 -07:00
Zuhayr Elahi
870fa4ea2c modified docker_cli_kill_test.go to use c.Asserts 
Signed-off-by: Zuhayr Elahi <elahi.zuhayr@gmail.com>
Upstream-commit: d0762a60e01339235917007fd48722ce5390ed71
Component: engine
 2015-10-27 21:18:26 -07:00
Jess Frazelle
72e420120c Merge pull request #17418 from diogomonica/bump-go-1.5 
Bump go 1.5
Upstream-commit: 96a6e810de0bfabe6cc59588f237470810703656
Component: engine
 2015-10-27 20:12:43 -07:00
Lei Jitang
62616f762f Fix docker inspect display odd gateway value for none network mode 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 7fa601adc7858606630dec5b037e60b8955e716d
Component: engine
 2015-10-27 21:47:12 -04:00
Jess Frazelle
238006044d Merge pull request #17423 from cpuguy83/so_sensitive 
Revert "dockerversion placeholder for library-import"
Upstream-commit: b227d19cae34d6d0ce92b72a53f02330b0be5992
Component: engine
 2015-10-27 18:32:18 -07:00
Brian Goff
cc55863497 Revert "dockerversion placeholder for library-import" 
This reverts commit d5cd032a86617249eadd7142227c5355ba9164b4.

Commit caused issues on systems with case-insensitive filesystems.
Revert for now

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: b78ca243d9fc25d81c1b50008ee69f3e71e940f6
Component: engine
 2015-10-27 21:23:53 -04:00