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
19,538 Commits 12 Branches 296 Tags
3a2fac063256ca99bb3d32cfdec9cd809980d72e
Commit Graph

688 Commits

Author SHA1 Message Date
Hu Keping
4351cce524 Update logic of history 
Signed-off-by: Hu Keping <hukeping@huawei.com>
Upstream-commit: 5a3236d9e8ee8c0051c0cc758ec359fa089b3291
Component: engine
 2015-11-02 10:27:54 +08:00
Arnaud Porterie
1dd04a954b Merge pull request #16579 from coolljt0725/fix_attach_paused_container 
Add show error when attach to a paused container
Upstream-commit: 5719d010665377c0696e36b894e742399deb30ed
Component: engine
 2015-10-31 07:43:22 -07:00
John Howard
884d36120f Windows: Allows --isolation on docker build 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: d5c85897f43b1956f874c6c93d10c30b5b82a726
Component: engine
 2015-10-30 11:14:38 -07: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
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
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
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
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
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
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
Vincent Demeester
4d261096ec dockerversion placeholder for library-import 
- Move autogen/dockerversion to version
- Update autogen and "builds" to use this package and a build flag

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d5cd032a86617249eadd7142227c5355ba9164b4
Component: engine
 2015-10-27 20:36:07 +01:00
Madhu Venugopal
8ad5b6fcfd Enhancing --cluster-advertise to support <interface-name> 
--cluster-advertise daemon option is enahanced to support <interface-name>
in addition to <ip-address> in order to amke it  automation friendly using
docker-machine.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 3e7db73b99498d037b43eb59972a6360cfbc971b
Component: engine
 2015-10-27 11:03:22 -07:00
John Howard
14116a686a Windows: Volume integration tests 
Signed-off-by: John Howard <jhoward@microsoft.com>
Upstream-commit: 2af5034ce8faa1f93d81864aa25ec64527fac76b
Component: engine
 2015-10-26 14:33:28 -07:00
moxiegirl
be6855048d Merge pull request #17319 from vdemeester/fix-network-help-inspect-syntax 
Update docker network inspect help syntax
Upstream-commit: c10ef20ed86befcf15b32d5081165bbd28b01c94
Component: engine
 2015-10-24 21:56:38 -07:00
Sebastiaan van Stijn
1489d6cd3f Merge pull request #15780 from mountkin/build-multi-tags 
Add ability to add multiple tags with docker build
Upstream-commit: 448398c2a8a41b6589dd7deb59fdc889e78db223
Component: engine
 2015-10-23 13:50:35 -07:00
Vincent Demeester
9f54d8d961 Update docker network inspect help syntax 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3dd50eaf054833280aad16e718bca4139d927532
Component: engine
 2015-10-23 22:48:22 +02:00
Shijiang Wei
a4eeeb73b3 Add ability to add multiple tags with docker build 
Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: c2eb37f9aeb6215293483e02613514e49011cf2c
Component: engine
 2015-10-24 00:59:56 +08:00
David Calavera
dad1c1a473 Fail when there is an error executing an inspect template. 
- Do not execute the template directly in the cli outout, go is not atomic
in this operation and can send bytes before failing the execution.
- Fail after evaluating a raw interface if the typed execution also
failed, assuming there is a template parsing error.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 3b9c13873afdfe6c884e1265397d7c5cb9cd5c5c
Component: engine
 2015-10-22 19:24:50 -04:00
Tonis Tiigi
da35e80d77 Show trust variable deprecation warning only if used 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
Upstream-commit: dfdee4130816cd5334330cc431d8200c1fa4e609
Component: engine
 2015-10-22 11:01:30 -07:00
Sebastiaan van Stijn
4a8a97b06e Merge pull request #17218 from vdemeester/17023-network-multiple-inspect 
Add support for multiple network in inspect
Upstream-commit: 9f031f70ce832a5f3fde7bd902e66abeb44f19a9
Component: engine
 2015-10-21 11:09:02 -07:00
Tibor Vass
91b1ec8aba Merge pull request #16940 from coolljt0725/default_tls_host 
Make default tls host work
Upstream-commit: 6a7c38a57d865afc89e4d6ec388bae3b9bedb870
Component: engine
 2015-10-21 14:02:22 -04:00
Sebastiaan van Stijn
6672204b41 Merge pull request #17136 from gesellix/change-route-volume-create 
rename `POST /volumes` to `POST /volumes/create`
Upstream-commit: 492945235b6be7f2f7ff8721de0c01a93d0b0f6f
Component: engine
 2015-10-21 10:21:27 -07:00
Vincent Demeester
9086b77304 Add support for multiple network in inspect 
To be consistent with other inspect command (on container and images),
add the possiblity to pass multiple network to the network inspect
commands.

`docker network inspect host bridge none` is possible now.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 7af9f988ac535e4ae2e87976db25d4f7047274db
Component: engine
 2015-10-21 08:57:29 +02:00
Antonio Murdaca
a641f84771 Merge pull request #17125 from calavera/check_exec_start_json 
Check the content type is json when calling exec start.
Upstream-commit: bb085b76619e8e73e39f68efb1b407e16da67822
Component: engine
 2015-10-19 18:44:42 +02:00
David Calavera
f0927e3716 Check the content type is json when calling exec start. 
Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 45dc57f22931e6cb8ad522602da8aa985bddcfab
Component: engine
 2015-10-19 11:46:44 -04:00
Lei Jitang
f833d205f0 Make default tls host work 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: fbb01b816288c5cf3eb79358c035072766b6e0f0
Component: engine
 2015-10-19 21:17:37 +08:00
Tobias Gesellchen
4a78d859fe rename POST /volumes to POST /volumes/create to be consistent with the other POST /.../create endpoints 
see #17132

Signed-off-by: Tobias Gesellchen <tobias@gesellix.de>
Upstream-commit: 0c95eeb584f5033e1f1cc8eb383306b87d3f133f
Component: engine
 2015-10-17 14:13:40 +02:00
Antonio Murdaca
efafa4e0c7 Merge pull request #17119 from vdemeester/17117-deprecate-c-cli-opts 
Deprecate -c cli short variant flag in docker cli build & create
Upstream-commit: ab1f03397ed48440454332598fa707afa9187b42
Component: engine
 2015-10-17 10:22:46 +02:00
Vincent Demeester
943431b7fa Deprecate -c cli short variant flag in docker cli 
- build
- create

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: d1064bd441612244d7a560c6ceb3704ad12b23a6
Component: engine
 2015-10-17 00:05:34 +02:00
Madhu Venugopal
08be0c3eb3 Pass network driver option in docker network command 
Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 6f3eb994b52dac9e336db9fe9f204e120553e8a7
Component: engine
 2015-10-16 14:33:54 -07:00
Victor Vieux
fbe671eb09 use Server Version 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: 17b0017cd0949f0772a849e6e5d0ee6084ff5340
Component: engine
 2015-10-14 17:46:59 -07:00
Victor Vieux
aef0c60b60 only display 'Engine Version' when it's not empty 
Signed-off-by: Victor Vieux <vieux@docker.com>
Upstream-commit: ddf04ad113cd84da40dbd27379211751d50df435
Component: engine
 2015-10-14 06:45:11 -07:00
Alexandre Beslic
0e3861a2d2 Merge pull request #16910 from mavenugo/ipam 
Vendoring libnetwork for the pluggable IPAM driver support
Upstream-commit: 4ea3ff70618d28520d2ae787bd00206d05c9f1db
Component: engine
 2015-10-13 14:41:19 -07:00
Vincent Demeester
019ffb819f Merge pull request #15796 from azurezk/add-size-to-inspect 
add container size info to inspect
Upstream-commit: ce607916e9b4e294e66188bbaf50acaa86e3909f
Component: engine
 2015-10-13 23:16:10 +02:00
Madhu Venugopal
7a285e518e IPAM API & UX 
introduced --subnet, --ip-range and --gateway options in docker network
command. Also, user can allocate driver specific ip-address if any using
the --aux-address option.
Supports multiple subnets per network and also sharing ip range
across networks if the network-driver and ipam-driver supports it.
Example, Bridge driver doesnt support sharing same ip range across
networks.

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: cc6aece1fdefbc10638fe9e462a15608c6093115
Component: engine
 2015-10-13 11:03:03 -07:00
Doug Davis
bb94a5ee85 Remove used param on ParseHost 
The first param on opts.ParseHost() wasn't being used for anything.

Once we get rid of that param we can then also clean-up some code
that calls ParseHost() because the param that was passed in wasn't
being used for anything else.

Signed-off-by: Doug Davis <dug@us.ibm.com>
Upstream-commit: ba973f2d74c150154390aed1a5aed8fb5d0673b8
Component: engine
 2015-10-11 20:45:17 -07:00
Sebastiaan van Stijn
b34ed2cbab Merge pull request #15753 from SvenDowideit/make-windows-default-to-use-2376 
Default the tcp port to 2376 if tls is on, and 2375 if not
Upstream-commit: c45ad0b02d1cc1f88aaabab18aed27aeb20b9e7a
Component: engine
 2015-10-11 15:35:04 -07:00
Zhang Kun
9375e8c909 add size to inspect 
Signed-off-by: Zhang Kun <zkazure@gmail.com>
Upstream-commit: b4d6b23838bb7d8436a1966fc3ef3ade83544d58
Component: engine
 2015-10-10 20:44:29 +08:00
Sven Dowideit
4e6b402919 Default the tcp port to 2376 if tls is on, and 2375 if not 
Refactor so that the Host flag validation doesn't destroy the user's input,
and then post process the flags when we know the TLS options

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
Upstream-commit: 50f0906007bdec83dd23b6ae5216769ab65bbf59
Component: engine
 2015-10-09 17:48:03 -07:00
Diogo Monica
f27c37e60e Changing docs to reflect new names 
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: d9a2fadb5e26cb0e8e79c260b74236a16d9a9e33
Component: engine
 2015-10-09 15:13:37 -07:00
Diogo Monica
596fe0bbd1 Changed trust ENV variables while still supporting old ones 
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: 52240c2d62508e08cddcce42f04e45855750b381
Component: engine
 2015-10-09 12:19:43 -07:00
Jess Frazelle
74340a2f1e Merge pull request #16859 from diogomonica/changing-trust-server-checks 
Changing trustServer allowed URL validation
Upstream-commit: a1d432301d08f6fbf4da792c0b35a67cfdbc770e
Component: engine
 2015-10-08 18:33:35 -07:00
Diogo Monica
5d84a009ca Changing trustServer allowed URL behavior 
Signed-off-by: Diogo Monica <diogo@docker.com>
Upstream-commit: a2f9fb7777ab4ff90747a1fe67dda9046686acad
Component: engine
 2015-10-08 17:47:25 -07:00
Jess Frazelle
6c294ed6e9 Merge pull request #16544 from Mashimiao/fix-bug-client-start-signal-discarded 
client/start: fix logic for discarded signal
Upstream-commit: 4796b5c2f84c38960bb1147dff59d7946172b598
Component: engine
 2015-10-08 12:54:31 -07:00
Jess Frazelle
e20529cb2b Merge pull request #16785 from cpuguy83/exec_cleanup 
Cleanup some issues with exec
Upstream-commit: cc411c054ffc16fff1ec27b49047ff7dba6a1e04
Component: engine
 2015-10-08 12:02:03 -07:00
Jess Frazelle
885627be00 Merge pull request #16674 from coolljt0725/use_consistent_command_description 
Use consistent command description
Upstream-commit: b5d914188efa55e6cf1fcd14334b2c1b61181eea
Component: engine
 2015-10-08 12:01:16 -07:00
Jess Frazelle
90f924b006 Merge pull request #16817 from cpuguy83/explicit_volume_ls 
Make `docker volume` behave like `docker network`
Upstream-commit: 9123f77a78c8565e83b8c42a4f14dd0c75f0af66
Component: engine
 2015-10-08 11:36:51 -07:00
Lei Jitang
262c5c28a2 Use consistent command description 
Signed-off-by: Lei Jitang <leijitang@huawei.com>
Upstream-commit: 2b0927c9ac23b66d8a05761801d1c5f882ba8dfb
Component: engine
 2015-10-08 08:46:21 -04:00