toolshed/docker-cli
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,493 Commits 3 Branches 295 Tags
9400b9a7bc6068f105d60072805bbb3f525fc2ce
Commit Graph
19493 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Lei Jitang 8ca5c39620 Add show error when attach to a paused container 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: de1d611990a80cf4a38ec501469c08c1aeee2d60
Component: engine
 2015-10-28 21:00:09 -04: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
Qiang Huang ff53341015 Bump bolt to v1.1.0 
It adds ARM64, ppc64le, s390x, solaris support, and a bunch of
bugfixs.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
Upstream-commit: a41917c2c88bd7f694d141ac67f4a194aaa16fa1
Component: engine
 2015-10-28 08:49:45 +08:00
Dong Chen 76053edbd7 extract docker volume API from local 
Signed-off-by: Dong Chen <dongluo.chen@docker.com>
Upstream-commit: 9862a4b43ec6236305f6b57274c6edd61dad96b7
Component: engine
 2015-10-27 17:28:19 -07:00
Tibor Vass 50ef9e9aba Merge pull request #17422 from calavera/inspect_networks_docs 
Update inspect api examples with new network settings.
Upstream-commit: 94811ae814ddce67b623d35ef44dcf276629442f
Component: engine
 2015-10-27 20:09:54 -04:00
David Calavera fbb5f4e19f Merge pull request #17393 from tiborvass/carry-17360 
Carry Fix docker inspect container only reports last assigned information
Upstream-commit: 9ab71b68af5b340373411e26e679c6e7506ce167
Component: engine
 2015-10-27 17:00:41 -07:00
David Calavera 28eb09ab06 Update inspect api examples with new network settings. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 9a7e632cf097b71aab6e46ef010d038f602e03d3
Component: engine
 2015-10-27 19:56:29 -04:00
Brian Goff 1cfc0cf7f6 Merge pull request #17373 from Microsoft/10662-volumetests 
Windows: Volume integration tests
Upstream-commit: 2266462f724492d3802d7043723347adeb18024e
Component: engine
 2015-10-27 19:52:11 -04:00
Samuel Karp 069f98c935 [awslogs] Auto-detect region on EC2 instances 
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 8a6dfb26f30331231839c420f8cf8889c9ef35a8
Component: engine
 2015-10-27 23:47:28 +00:00
Samuel Karp 32f8320544 [awslogs] Set User-Agent for Amazon CloudWatch Logs 
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 480c9c01784d65a46f6ba62e8176e9b2a6a3feab
Component: engine
 2015-10-27 23:47:19 +00:00
Samuel Karp 2e7de41d92 Update vendored aws-sdk-go 
Signed-off-by: Samuel Karp <skarp@amazon.com>
Upstream-commit: 70083e6fc3a7f64755fcf4752e6d24758bdd0543
Component: engine
 2015-10-27 23:43:51 +00:00
David Calavera 6c30abdc61 Extract network settings types for inspect. 
Keeping backwards compatibility.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 25682577c9d29b325b4b615c4b88c132a4640082
Component: engine
 2015-10-27 19:16:21 -04:00
Sebastiaan van Stijn 3babd01129 Merge pull request #16017 from flowlo/master 
docs: Explain volume_name in POST /container Binds
Upstream-commit: b96e076af9478f37c5efd3f56e5f0aa42c846b66
Component: engine
 2015-10-27 23:28:47 +01:00
David Calavera d0602d1990 Merge pull request #17401 from hugomarisco/patch-1 
update gpg add key command, without sudo it fails
Upstream-commit: 1156b7ff66c749814535008e66149a6027dc9a36
Component: engine
 2015-10-27 15:16:27 -07:00
Jessica Frazelle 99471f9ab2 update to binaries, fix parsers package, non-parallel test unit 
Signed-off-by: Jessica Frazelle <acidburn@docker.com>
Upstream-commit: 9bcbb39fa8b91ceb54c3da7b245e79b56de1cb6b
Component: engine
 2015-10-27 14:43:25 -07:00
Brian Goff a3a7b41a5a Merge pull request #17382 from jecarey/16765-docker_cli_images_test 
Use of checkers on docker_cli_images_test.go
Upstream-commit: 1c8ee617d164fec5da15d274516dc5131bcd41dd
Component: engine
 2015-10-27 17:25:45 -04:00
David Calavera 9cd08e6796 Merge pull request #17350 from vdemeester/11699-auto-libraryimport 
dockerversion placeholder for library-import
Upstream-commit: 6276c676a897ab8a4c7fdcd78d18c8fc3a761707
Component: engine
 2015-10-27 13:39:40 -07:00
Alexandre Beslic 95c227e717 Merge pull request #17364 from mavenugo/advertise 
Enhancing --cluster-advertise to support <interface-name>
Upstream-commit: 85ae8b034a5bf9428dbcc7cfd94c55739eaf2862
Component: engine
 2015-10-27 13:29:18 -07:00
David Calavera af90e68a88 Merge pull request #17405 from LK4D4/cont_pointer 
Return pointer from newBaseContainer
Upstream-commit: 82f70677b99e7d30c63d40658b36b0c5373cadba
Component: engine
 2015-10-27 13:27:10 -07:00
James Carey 46ab4a1920 Use of checkers on docker_cli_images_test.go 
Signed-off-by: James Carey <jecarey@us.ibm.com>
Upstream-commit: 5814d67f9850e5eff9d6beb24b2b9dde89ee7381
Component: engine
 2015-10-27 15:26:38 -05:00
Lei Jitang c2f87fdd0e Fix docker inspect container only reports last assigned information 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 1b9a08e719776e53b7aea1a89c2c29fbf27b1ae4
Component: engine
 2015-10-27 16:26:06 -04:00
David Calavera 64556fe044 Merge pull request #17406 from LK4D4/ent_and_args_simple 
Simplify getEntrypointAndArgs
Upstream-commit: 2b1b7823e61d9d14064708d37a56275ee7385bd2
Component: engine
 2015-10-27 13:24:59 -07:00