dilim/moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2026-07-12 18:45:06 +00:00
Code Issues Packages Projects Releases Wiki Activity
31,651 Commits 19 Branches 583 Tags
0937dadfdff35a061a6bcd5bf661a4c112f0aafb
Commit Graph

632 Commits

Author SHA1 Message Date
Vincent Demeester
4180211d80 Merge pull request #32186 from aaronlehmann/cluster-omitempty 
api: Omit Cluster, Nodes, and Managers from swarm info when unavailable
 2017-03-29 10:38:52 +02:00
Aaron Lehmann
3894254ddd api: Omit Cluster, Nodes, and Managers from swarm info when unavailable 
Currently these fields are included in the response JSON with zero
values. It's better not to include them if the information is
unavailable (for example, on a worker node).

This turns Cluster into a pointer so that it can be left out.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-28 14:20:25 -07:00
Daniel Nephin
d3ea30de10 Add entrypoint flags to service cli. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-28 11:24:19 -07:00
Sebastiaan van Stijn
4df350b8c7 Merge pull request #30810 from allencloud/make-secret-ls-support-filter 
make secret ls support filters in CLI
 2017-03-28 13:43:19 +02:00
Vincent Demeester
99aaf6b923 Merge pull request #31709 from dnephin/better-errors 
Replace fmt.Errorf() with errors.Errorf() in the cli
 2017-03-28 10:17:46 +02:00
Vincent Demeester
4155343f44 Merge pull request #32128 from vdemeester/30836-set-alias-to-servicename 
Set the alias to the service name instead of the network name
 2017-03-28 09:46:05 +02:00
Tibor Vass
febbe38796 Manually reorganize import paths to segregate stdlib and 3rd-party packages 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-27 18:21:59 -07:00
Madhu Venugopal
04295d26df Merge pull request #31714 from aboch/cingr 
Allow user to replace ingress network
 2017-03-27 07:30:42 -07:00
Vincent Demeester
ee08c8542a Set the alias to the service name instead of the network name 
This makes it work a little closer to compose part and it is more
correct 👼

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-27 11:42:15 +02:00
allencloud
3935074016 make secret ls support filters in CLI 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-27 10:16:45 +08:00
Alessandro Boch
d59d19c328 Allow user to modify ingress network 
Signed-off-by: Alessandro Boch <aboch@docker.com>
 2017-03-26 15:46:18 -07:00
Vincent Demeester
ab08a571d1 Merge pull request #31976 from Microsoft/jjh/csbooboo 
Windows: Remove --credentialspec flag
 2017-03-26 12:44:27 +02:00
Daniel Nephin
7b7ea8ab81 Replace fmt.Errorf() with errors.Errorf() in the cli 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-24 16:58:07 -04:00
John Howard (VM)
53d6aadda5 Windows: Remove --credentialspec flag 
Signed-off-by: John Howard (VM) <jhoward@ntdev.microsoft.com>
 2017-03-23 10:01:04 -07:00
Sebastiaan van Stijn
ad530ffee0 Merge pull request #31986 from Microsoft/jjh/fix28267 
Windows: Don't close client stdin handle to avoid hang
 2017-03-23 16:35:54 +01:00
Tonis Tiigi
385f1174ff Return proper exit code on builder panic 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-21 19:09:23 -07:00
John Howard (VM)
91e971c0fe Windows: Don't close client stdin handle to avoid hang 
Signed-off-by: John Howard (VM) <jhoward@microsoft.com>
 2017-03-21 16:00:17 -07:00
Victor Vieux
afe1c5c2eb Merge pull request #31705 from cyli/bump-go-connections 
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
 2017-03-21 10:36:41 -07:00
Vincent Demeester
f965aab5e9 Merge pull request #31621 from dnephin/cleanup-container-run-command 
Some cleanup of container run command
 2017-03-21 16:01:11 +01:00
Sebastiaan van Stijn
1ec77baed9 Merge pull request #31552 from ripcurld0/add_format_secretls 
Add format to secret ls
 2017-03-20 20:20:45 +01:00
liker12134
2333b39b37 fixed:go vetting warning unkeyed fields 
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com>
 2017-03-20 16:30:01 +08:00
Boaz Shuster
e281fe9c3a Add format to secret ls 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-19 09:22:30 +02:00
Vincent Demeester
8bc703804d Merge pull request #30781 from AkihiroSuda/fix-stack-env 
compose: fix environment interpolation from the client
 2017-03-17 15:56:50 +01:00
Sebastiaan van Stijn
d376b18caf Merge pull request #31896 from aaronlehmann/move-secretrequestoption 
api: Remove SecretRequestOption type
 2017-03-16 21:31:15 +01:00
Sebastiaan van Stijn
f5c57d88a4 Merge pull request #31886 from daniel48/master 
fix a typo
 2017-03-16 21:30:22 +01:00
Aaron Lehmann
e7c39f4d5d api: Remove SecretRequestOption type 
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-03-16 11:20:31 -07:00
Pure White
1d61f11e34 fix a typo 
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx

Signed-off-by: Pure White <daniel48@126.com>
 2017-03-16 23:11:57 +08:00
Sebastiaan van Stijn
e638089622 Add missing API version annotations to commands 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-16 13:40:12 +01:00
Vincent Demeester
52143aee95 Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag 
misleading default for --update-monitor duration
 2017-03-16 10:13:26 +01:00
Vincent Demeester
8316753f96 Merge pull request #31866 from gdevillele/pr_service_create 
improve semantics of utility function in cli/command/service
 2017-03-16 10:12:15 +01:00
Akihiro Suda
87c5f67cfa Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain 
fix incorect login client credential save when the registry is the default docker registry
 2017-03-16 13:19:32 +09:00
Gaetan de Villele
1526a99672 improve semantics of utility function in cli/command/service 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-03-15 13:49:52 -07:00
Victor Vieux
4bce232139 Revert "Planned 1.13 deprecation: email from login" 
This reverts commit a66efbddb8.

Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-15 10:43:18 -07:00
erxian
3e6ff87f69 misleading default for --update-monitor duration 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2017-03-15 14:20:02 +08:00
Daniel Nephin
644fd804fc Add --prune to stack deploy. 
Add to command line reference.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:09:28 -04:00
Daniel Nephin
a9c86b63c0 Fix environment resolving. 
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-14 16:00:43 -04:00
Akihiro Suda
ea43c33330 compose: fix environment interpolation from the client 
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.

Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-03-14 15:59:40 -04:00
Victor Vieux
1a24abe42d Merge pull request #31809 from vieux/bump_api 
bump API to 1.28
 2017-03-14 11:53:52 -07:00
Victor Vieux
cd173a6030 bump API to 1.28 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-14 09:32:50 -07:00
Vincent Demeester
1d4608032d Merge pull request #31500 from dperny/fix-service-logs-cli 
Add tail and since to service logs
 2017-03-14 14:19:29 +01:00
Madhu Venugopal
cdf66ba715 Merge pull request #31710 from sanimej/drillerrr 
Add verbose flag to network inspect to show all services & tasks in swarm mode
 2017-03-13 21:12:32 -07:00
Santhosh Manohar
14f76a21db Enhance network inspect to show all tasks, local & non-local, in swarm mode 
Signed-off-by: Santhosh Manohar <santhosh@docker.com>
 2017-03-13 17:52:08 -07:00
Brian Goff
aa733ba8a8 Merge pull request #31672 from dperny/service-logs-formatting 
Service logs formatting
 2017-03-13 19:08:55 -04:00
Daniel Nephin
6a21a127ab Refactor container run cli command. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-03-13 16:05:51 -04:00
Justin Cormack
2c6a1e1878 Merge pull request #31579 from ijc25/cpuacct 
Correct CPU usage calculation in presence of offline CPUs and newer Linux
 2017-03-13 16:32:18 +00:00
Vincent Demeester
be453c5a13 Merge pull request #30788 from ripcurld0/hide_win_opts 
Hide command options that are related to Windows
 2017-03-13 16:15:29 +01:00
Sebastiaan van Stijn
562d2dc978 Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect 
do not fail fast when executing inspect command
 2017-03-13 16:04:04 +01:00
Boaz Shuster
7199522ea2 Hide command options that are related to Windows 
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
 2017-03-12 08:47:17 +02:00
Tibor Vass
e10f9db26d Merge pull request #30047 from duglin/distError 
Add the mediaType to the error
 2017-03-10 16:44:49 -08:00
Drew Erny
8dc437bd9b Add tail and since to service logs 
This change adds the ability to do --tail and --since on docker service
logs. It wires up the API endpoints to each other and fixes some older
bugs. It adds integration tests for these new features.

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-03-10 14:59:00 -08:00