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,161 Commits 12 Branches 296 Tags
efb454486253bf2da044b3acde74b4ce2e3e9384
Commit Graph

1254 Commits

Author SHA1 Message Date
Brian Goff
834dc8ee1e Merge pull request #17177 from runcom/bc-fixes 
Return empty Config fields, now omitempty, for API < 1.21
Upstream-commit: c516aa645ee407c4b67033b20fcf5c2849b98f21
Component: engine
 2015-10-20 16:39:53 -04:00
Tibor Vass
b4f9b290d4 Merge pull request #17128 from calavera/network_controller_enabled 
Do not initialize the networking routes when netController is not enabled.
Upstream-commit: 82a8a14c4d039579f80b640b5f815964e99db746
Component: engine
 2015-10-19 16:13:31 -04:00
David Calavera
33442d477a Merge pull request #16957 from MHBauer/eventsservice-refactor 
refactor access to daemon member EventsService
Upstream-commit: b27fa6c58e020b35d725b89badb82dbbc5cb84bc
Component: engine
 2015-10-19 11:45:29 -07:00
David Calavera
b8b4d2b3f7 Return 404 for all network operations without network controller. 
This will prevent the api from trying to serve network requests in
systems where libnetwork is not enabled, returning 404 responses in any
case.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: eb982e7c00192c8306f9c420fb469f087c7b161d
Component: engine
 2015-10-19 14:40:18 -04:00
Antonio Murdaca
372d5d880d Return empty Config fields, now omitempty, for API < 1.21 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: 850bc0838a509d220bc78e47aa8203420aca22eb
Component: engine
 2015-10-19 19:09:36 +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
Morgan Bauer
ab68eef7dd refactor access to daemon member EventsService 
Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 2abf5d986ec6779555ea615763d3ffccede6121a
Component: engine
 2015-10-19 09:41:29 -07:00
Doug Davis
f37af18747 Merge pull request #17115 from mountkin/tag-on-build 
Proposal: emit a "tag" event when building image with "-t" parameter
Upstream-commit: e62fd33d963cdba947a9ef5abe100a9d85c58f24
Component: engine
 2015-10-19 12:35:58 -04: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
Garrett Barboza
d4f1e8054e Change sorting method and add test to DisplayablePorts 
Signed-off-by: Garrett Barboza <garrett@garrettbarboza.com>
Upstream-commit: c4c6d33bbcacab113f874b7407499c5f71cf72a0
Component: engine
 2015-10-19 10:38:54 -05:00
Shijiang Wei
12d92cfae8 emit a "tag" event when building image with "-t" parameter 
This is useful for cluster systems such as swarm to sync the image
state when new images are successfully built.

Signed-off-by: Shijiang Wei <mountkin@gmail.com>
Upstream-commit: 2968fa44eb2a53c121ad2b27c519ae47ca7653c3
Component: engine
 2015-10-19 20:09:14 +08: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
Arnaud Porterie
46bdc83696 Merge pull request #16998 from vieux/engine_version 
only display 'Engine Version' when it's not empty
Upstream-commit: 9216b085363f4551ffe3b6cdba983eba3b945205
Component: engine
 2015-10-15 08:43:32 -07:00
Doug Davis
27566cbbc9 Merge pull request #16966 from MHBauer/image-refactor 
refactor use of container struct from daemon
Upstream-commit: 32ead68e9f233ae809c8928a74700748c50fa3c0
Component: engine
 2015-10-15 07:30:08 -04: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
David Calavera
f38f3109c2 Remove defensive check of mux vars handling. 
We should not check if the mux framework internals work as expected in every handler.
The missing parameter error doesn't make sense from the user point of view.

This change initializes a proper vars context if the mux fails to do so and delegates
specific parameter error checks to the handlers.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 389ce0aae6a303660e591ef80272322ac82854e2
Component: engine
 2015-10-14 10:31:09 -07:00
Vincent Demeester
9be0d4300b Merge pull request #16968 from MHBauer/network-refactor 
refactor use of container struct from daemon
Upstream-commit: aaa8cae34537eb9bddacacc8bce61c91ca76d7d2
Component: engine
 2015-10-14 17:48:08 +02: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
Tibor Vass
98858eadeb Bump API Version to v1.22 
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 22a0ea555069c47a132ac1579324e70d2bcde39d
Component: engine
 2015-10-13 17:27:33 -07:00
Morgan Bauer
182a4806ba refactor use of container struct from daemon 
- do existence check instead of get container
 - new connect method on daemon.
 - cli network disconnect integration test

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: a0398fbd197b5c4cf261b702ba1a1f924d6134e8
Component: engine
 2015-10-13 16:34:28 -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
Madhu Venugopal
2cd0b95af5 Docker side changes for the newly introduced IPAM driver 
* Made use of IPAM driver primitives for legacy IP configurations
* Replaced custom Generics with backend labels

Signed-off-by: Madhu Venugopal <madhu@docker.com>
Upstream-commit: 0f351ce3643a97d4b6af0021826b851f9ba41967
Component: engine
 2015-10-13 10:52:59 -07:00
Antonio Murdaca
bc9fb8d7f3 Fix Config.Cpuset from API < 1.20 
Signed-off-by: Antonio Murdaca <amurdaca@redhat.com>
Upstream-commit: 8c63ce4f6b78bd1d87c92ecfbcc20ccfd80f7d63
Component: engine
 2015-10-13 09:09:05 +02:00
Morgan Bauer
647970c93e refactor use of container struct from daemon 
- use Exists instead of Get
 - push Get inside of daemonbuilder

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 844fb2961976d1bca52cc8560abf6b1ac2ae754a
Component: engine
 2015-10-12 16:20:55 -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
Vincent Demeester
deb9d3a7fc Merge pull request #16865 from MHBauer/registry-service-refactor 
refactor away direct references to daemon member
Upstream-commit: 6e12d9fe62f201dac221be5064e743f59f9a1953
Component: engine
 2015-10-11 21:47:58 +02:00
Arnaud Porterie
36fdf8f132 Merge pull request #12648 from estesp/userns-impl 
Phase 1 implementation of user namespaces as a remapped container root
Upstream-commit: ed9434c5bb64f49db442027e5e748bfbb46d0a0a
Component: engine
 2015-10-10 11:38:07 -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
Phil Estes
171ab4083f Merge pull request #16894 from diogomonica/renaming-trust-keys 
Renaming trust keys
Upstream-commit: bf80adeee49e78e181007ff6790bf1ff2b22a72e
Component: engine
 2015-10-09 23:20:54 -04: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
Phil Estes
93c2a19d83 Add user namespace (mapping) support to the Docker engine 
Adds support for the daemon to handle user namespace maps as a
per-daemon setting.

Support for handling uid/gid mapping is added to the builder,
archive/unarchive packages and functions, all graphdrivers (except
Windows), and the test suite is updated to handle user namespace daemon
rootgraph changes.

Docker-DCO-1.1-Signed-off-by: Phil Estes <estesp@linux.vnet.ibm.com> (github: estesp)
Upstream-commit: 442b45628ee12ebd8e8bd08497896d5fa8eec4bd
Component: engine
 2015-10-09 17:47:37 -04:00
Morgan Bauer
8d04ef47a0 refactor away direct references to daemon member 
- add daemon methods Authenticate & SearchRegistryForImages
 - use new methods instead of directly accessing RegistryService

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: 215bfc73d2f162e2c4fdc306923de8ca4788d389
Component: engine
 2015-10-09 14:40:03 -07:00
Brian Goff
92b8b3f4bb Merge pull request #16709 from MHBauer/daemon-derepo2 
continue daemon refactor of Repositories()
Upstream-commit: 7787d6dc2882def6bc125395c924827d30bd8a03
Component: engine
 2015-10-09 15:35:21 -04: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
Morgan Bauer
abbfb24add continue daemon refactor of Repositories() 
- use daemon member directly rather than through a function call
 - create GetImage method for use external to deamon

Signed-off-by: Morgan Bauer <mbauer@us.ibm.com>
Upstream-commit: ee36b57c8f3c33f1c50ecb4305bd62a962876fe6
Component: engine
 2015-10-08 15:06:55 -07:00
Jess Frazelle
a78c0b3db5 Merge pull request #16638 from MHBauer/daemon-derepo 
refactor daemon image tagging
Upstream-commit: 67e38cc54cf528206aa150b05680748943764df8
Component: engine
 2015-10-08 14:14:20 -07:00
Jess Frazelle
510810895d Merge pull request #16366 from MHBauer/logs-refactor 
refactor logs to not use internal data structures
Upstream-commit: 01cd67e752aa8a2a7fa9605d5c53bc95862a4d7b
Component: engine
 2015-10-08 14:05:02 -07:00
Vincent Demeester
eae331677d Merge pull request #16826 from LK4D4/refactor_listenfd 
Refactor listenFD function
Upstream-commit: caf7d83c676857243629d1c60fd4def158675b6b
Component: engine
 2015-10-08 22:08:52 +02: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