beenull/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity
31630 commits 14 branches 412 tags 338 MiB
Commit graph

31630 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
Sebastiaan van Stijn
8098bf3896 Merge pull request #32185 from ewindisch/mailmap 
Update Erica in mailmap
 2017-03-28 22:02:35 +02:00
Erica Windisch
88535f9733 Update Erica in mailmap 
Fix my name and email address.

Signed-off-by: Erica Windisch <erica@windisch.us>
 2017-03-28 19:55:08 +00:00
Sebastiaan van Stijn
78e0ad7953 Merge pull request #32142 from vdemeester/integration-cli-package-2 
[test-integration] Migrate some more tests to `cli` package
 2017-03-28 21:37:07 +02:00
Brian Goff
c7c7f36da7 Merge pull request #32169 from thaJeztah/fix-non-swarm-prune 
Fix docker system prune failing with Swarm mode disabled
 2017-03-28 14:07:25 -04:00
Sebastiaan van Stijn
d386f813e0 Merge pull request #32176 from thaJeztah/add-albers-to-maintainers 
Add Harald Albers to maintainers
 2017-03-28 17:29:38 +02:00
Sebastiaan van Stijn
c19ba877e0 Merge pull request #32178 from thaJeztah/add-john-stephens-to-maintainers 
Add John Stephens to maintainers
 2017-03-28 17:29:02 +02:00
Sebastiaan van Stijn
a5a0d752a1 Merge pull request #32177 from thaJeztah/add-evan-to-maintainers 
add Evan Hazlett to maintainers
 2017-03-28 17:28:30 +02:00
Sebastiaan van Stijn
cfbde0b422
Add John Stephens to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:46:37 +02:00
Sebastiaan van Stijn
3c7fedc2fd
add Evan Hazlett to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:39:56 +02:00
Sebastiaan van Stijn
5cd4e96cd5
Add Harald Albers to maintainers 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:38:23 +02:00
Sebastiaan van Stijn
4f2ed03092 Fix docker system prune failing with Swarm mode disabled 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:35:24 +02:00
Sebastiaan van Stijn
8f4f85dd5b
Add NetworkManager and ClusterStatus interfaces 
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 16:35:14 +02:00
Brian Goff
b6cb416051 Merge pull request #30652 from rhatdan/selinux 
If caller specifies label overrides, don't override security options
 2017-03-28 10:24:47 -04:00
Vincent Demeester
917cb0d9d0 Merge pull request #31683 from AkihiroSuda/it-on-swarm-easy-analysis 
integration-cli-on-swarm: new CLI flag: -keep-executor
 2017-03-28 15:50:52 +02:00
Vincent Demeester
eeaa6c96d8
[test-integration] Migrate some more tests to cli package 
Add some required command operators to the `cli` package, and update
some tests to use this package, in order to remove a few functions
from `docker_utils_test.go`

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 15:17:31 +02:00
Vincent Demeester
a048e131be Merge pull request #32086 from tripdubroot/32000-Update-push.md-doc 
Updated push.md with progress bar info
 2017-03-28 14:02:10 +02:00
Vincent Demeester
bd811aa4fd Merge pull request #31021 from mstanleyjones/31009_dockerd_experimental 
Update docs for experimental features
 2017-03-28 14:01:05 +02:00
Sebastiaan van Stijn
b385a9156e Merge pull request #31901 from davidxia/fix-docs 
[docs] Fix incorrect `docker inspect` example
 2017-03-28 14:00:05 +02: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
Misty Stanley-Jones
9fd27bf1a9
Update docs for experimental features 
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-28 13:25:11 +02:00
Sebastiaan van Stijn
0f8a3dafa4 Merge pull request #32034 from gpflaum/30841-fix-toc-deprecated 
Fix indenting in deprecated engine features toc
 2017-03-28 13:09:47 +02:00
Sebastiaan van Stijn
7c7cc0bbdc Merge pull request #31911 from allencloud/specify-max-size-for-secret-in-doc 
specify max size for secret in doc
 2017-03-28 12:59:19 +02:00
Sebastiaan van Stijn
54805701bd Merge pull request #32112 from vdemeester/carry-ref-inspect-detail 
Add details for inspect command usage
 2017-03-28 12:49:57 +02:00
EG Noriega
59ef08c878
Add details for inspect command usage 
Signed-off-by: Eric G. Noriega <egnoriega@users.noreply.github.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-28 11:04:10 +02:00
Vincent Demeester
95510551ce Merge pull request #32156 from cpuguy83/index_copy_new_slice 
Don't pass reference to mutable slice
 2017-03-28 10:23:08 +02:00
Vincent Demeester
1c7a3d3e6c Merge pull request #32152 from darrenstahlmsft/RevertWaitOOBE 
Windows: Revert change to wait for OOBE
 2017-03-28 10:22:03 +02:00
Vincent Demeester
35e5975b90 Merge pull request #30763 from ripcurld0/fix_30714 
Fix the create API when fromSrc has a bad URL
 2017-03-28 10:20:59 +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
Sebastiaan van Stijn
cf113faca6 Merge pull request #32126 from vdemeester/docs-ref-cli-root-commands 
Add cli reference docs for root-level commands
 2017-03-28 09:46:32 +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
allencloud
5f8fcd9d63 specify max size for secret in doc 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-03-28 10:17:03 +08:00
Tibor Vass
0d08818653 Do not replace fmt.Errorf in generated file 
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-27 18:33:41 -07:00
Brian Goff
d5b7839008 Don't pass reference to mutable slice 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-03-27 21:23:06 -04: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
Darren Stahl
6eed7f0cac Windows:Revert change to wait for OOBE 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2017-03-27 14:32:18 -07:00
Tõnis Tiigi
c5f178da05 Merge pull request #32077 from zigarn/build-output 
Display created tags on successful build
 2017-03-27 12:41:13 -07:00
Vincent Demeester
2413859a1f Merge pull request #32146 from mapk0y/fix-man-docker-run 
Update "man" of docker-run
 2017-03-27 21:36:04 +02:00
mapk0y
22f0b27f59 Update "man" of docker-run 
Signed-off-by: mapk0y <mapk0y@gmail.com>
 2017-03-28 02:50:57 +09:00
Sebastiaan van Stijn
abecc530ee Merge pull request #32107 from mkumatag/fix_api_doc 
Fix Healthcheck API doc
 2017-03-27 18:45:48 +02:00
Sebastiaan van Stijn
ae811e9597 Merge pull request #32114 from sdurrheimer/zsh-completion-network-ls-scope-filter 
Add zsh completion for 'docker network ls --filter scope'
 2017-03-27 18:36:08 +02:00
Sebastiaan van Stijn
b9c8d9c660 Merge pull request #32115 from sdurrheimer/zsh-completion-plugin 
Add missing zsh completion for 'docker plugin ls'
 2017-03-27 18:35:16 +02:00
Sebastiaan van Stijn
91f3f992f1 Merge pull request #30974 from erxian/add-new-cli-argument-squash-to-docker-build 
add docs to describe experimental CLI argument --squash to docker build
 2017-03-27 17:09:54 +02: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
1bb6a53e76 Merge pull request #32044 from jonisar/patch-1 
Readme grammer fix
 2017-03-27 16:20:45 +02: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
Vincent Demeester
9cea26bc77
Add cli reference docs for root-level commands 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-27 11:10:58 +02:00
Vincent Demeester
dc1f036772 Merge pull request #32119 from nogoegst/fix-openbsd-cli 
Fix building client on OpenBSD
 2017-03-27 09:52:50 +02:00
Vincent Demeester
e2f60837eb Merge pull request #31755 from miaoyq/heartbeat-maybe-zero 
The variable heartbeat might be 0
 2017-03-27 09:39:01 +02:00
Akihiro Suda
e5d474e856 Merge pull request #32121 from allencloud/remove-redundant-comment-in-test-build 
remove redundant comments in test build.go
 2017-03-27 14:40:37 +09:00