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

31446 commits

This branch
This branch
All branches
Author SHA1 Message Date
Sebastiaan van Stijn
595ea2f120 Merge pull request #31843 from jim-minter/attachrace_regression 
Resolve connection reset by peer regression
 2017-03-15 20:55:23 +01:00
Victor Vieux
a8ab5855ea Merge pull request #31837 from vieux/next 
prepare master for the next release
 2017-03-15 11:53:16 -07:00
Victor Vieux
75b31d2d71 Merge pull request #31851 from mlaventure/update-containerd 
Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73
 2017-03-15 11:09:53 -07:00
Yong Tang
43a1bd564b Support --filter mode=global|replicated for docker service ls 
This fix tries to address the request in 31325 by adding
`--filter mode=global|replicated` to `docker service ls`.

As `docker service ls` has a `MODE` column by default, it is natural
to support `--filter mode=global|replicated` for `docker service ls`.

There are multiple ways to address the issue. One way is to pass
the filter of mode to SwarmKit, another way is to process the filter
of mode in the daemon.

This fix process the filter in the daemon.

Related docs has been updated.

An integration test has been added.

This fix fixes 31325.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2017-03-15 11:06:57 -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
unclejack
5957dc4899 pkg/archive/diff.go: avoid redundant options init 
Signed-off-by: Cristian Staretu <cristian.staretu@gmail.com>
 2017-03-15 18:03:33 +02:00
Kenfe-Mickael Laventure
440b2cc7ab Update containerd to version 422e31ce907fd9c3833a38d7b8fdd023e5a76e73 
This fixes an issue preventing containerd from starting if the state
directory didn't exist already.

Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-15 08:08:39 -07:00
Vincent Demeester
297786f30c Merge pull request #31687 from AkihiroSuda/fix-test-duplicate-mountpoints 
TestDuplicateMountpointsForVolumesFromAndMounts: remove unintentional dependency for /tmp/data
 2017-03-15 14:15:39 +01:00
Sebastiaan van Stijn
5126862d43 Merge pull request #31846 from thaJeztah/remove-outdated-etc-hosts-reference 
docs: remove outdated reference to updating /etc/hosts
 2017-03-15 14:07:01 +01:00
Manjunath A Kumatagi
f4ea1081f4 Rename project/CONTRIBUTORS.md -> project/CONTRIBUTING.md 
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com>
 2017-03-15 08:48:27 -04:00
Justin Cormack
2d95c3ca61 Merge pull request #31844 from vdemeester/image-filter-reference-remove-version-if 
Don't compare API version in the future for `image ls` endpoint
 2017-03-15 12:06:46 +00:00
Sebastiaan van Stijn
b0d1936d30 Merge pull request #31302 from dnephin/purge-orphaned-services 
Add --prune to stack deploy
 2017-03-15 12:57:06 +01:00
Sebastiaan van Stijn
171f5d84f9
docs: remove outdated reference to updating /etc/hosts 
Starting with docker 1.10, docker no longer uses
/etc/hosts for service discovery, but uses an
embedded DNS server. This patch removes a reference
to the old (pre 1.10) behavior.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-03-15 12:27:23 +01:00
Vincent Demeester
0f9d22cd66
Replace API version comparison by a if… 
… as we don't know for sure what API version it will be at that time.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-03-15 10:46:06 +01:00
Jim Minter
dc0ee98805 Resolve connection reset by peer regression 
Signed-off-by: Jim Minter <jminter@redhat.com>
 2017-03-15 09:36:44 +00:00
erxian
3e6ff87f69 misleading default for --update-monitor duration 
Signed-off-by: erxian <evelynhsu21@gmail.com>
 2017-03-15 14:20:02 +08:00
Victor Vieux
817106aaa1 prepare master for the next release 
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
 2017-03-14 20:43:33 -07:00
Victor Vieux
0b9b7906af Merge pull request #31833 from tonistiigi/docker-group 
Fix default socket group regression
 2017-03-14 20:34:42 -07:00
Anusha Ragunathan
95b46ff68f Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format 
docker stack deploy interpolation format error due to not escaping $ now includes a hint
 2017-03-14 17:14:09 -07:00
Victor Vieux
cec9594947 Merge pull request #31790 from mlaventure/devicecgrouprules-api-swagger 
Update swagger.yaml and api/version-history.md for DeviceCgrouprules
 2017-03-14 16:51:09 -07:00
Tonis Tiigi
c7c2cd4e8e Fix default socket group regression 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-03-14 16:09:08 -07:00
French Ben
5443f0152f docs: added support for CLI yaml file generation 
Signed-off-by: French Ben <frenchben@docker.com>
Signed-off-by: Tibor Vass <tibor@docker.com>
 2017-03-14 16:04:08 -07:00
Harald Albers
693a418612 Add bash completion for network inspect --verbose 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-14 15:37:59 -07:00
Victor Vieux
f7cfacbfe9 Merge pull request #31824 from albers/completion-update--service-logs 
Update bash completion for `docker service logs`
 2017-03-14 14:44:36 -07:00
Victor Vieux
f72404e48d Merge pull request #31686 from AkihiroSuda/fix-defer-it-on-swarm 
integration-cli-on-swarm: make sure deferred function gets executed before os.Exit()
 2017-03-14 14:41:41 -07: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
Daniel Nephin
cd56476f18 Merge pull request #31795 from dnephin/compose-file-v3.2 
Compose file v3.2
 2017-03-14 14:10:24 -04:00
Justin Cormack
49376cddab Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy 
Add expanded mount format to stack deploy
 2017-03-14 17:53:28 +00:00
Victor Vieux
08bbd434f5 Merge pull request #31586 from aaronlehmann/digest-pin-context 
cluster: Renew the context after communicating with the registry
 2017-03-14 09:46:15 -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
Harald Albers
93546c257a Update bash completion for docker service logs 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-14 17:28:58 +01:00
Kenfe-Mickael Laventure
6e97f11df9 Update swagger.yaml and api/version-history.md for DeviceCgrouprules 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2017-03-14 07:24:29 -07:00
Evan Hazlett
8392123f30
restrict secret view to node level in controller 
Signed-off-by: Evan Hazlett <ejhazlett@gmail.com>
 2017-03-14 09:53:02 -04: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
Sebastiaan van Stijn
0f212b57e8 Merge pull request #31635 from christopher-gibson/master 
Fix fish autocompletion with custom ps output
 2017-03-14 11:28:59 +01:00
Vincent Demeester
6ea8006a4f Merge pull request #31791 from Microsoft/jjh/unpause 
CI cleanup - only unpause if platform supports it
 2017-03-14 10:58:06 +01:00
Sebastiaan van Stijn
d4db198592 Merge pull request #31813 from albers/docs-dockerd--no-new-privileges 
Remove docs for `dockerd --no-new-privileges`
 2017-03-14 10:09:12 +01:00
Harald Albers
0a1ace9d2f Remove docs for dockerd --no-new-privileges 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-14 10:00:14 +01:00
Sebastiaan van Stijn
9f3f1641c4 Merge pull request #31786 from albers/completion-service--placement-pref 
Add bash completion for topology-aware scheduling
 2017-03-14 09:54:47 +01:00
Harald Albers
71aba36d5a Add bash completion for topology-aware scheduling 
- bash completion for `docker service create --placement-pref`
- bash completion for `docker service update --placement-pref-{add,rm}`

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-14 08:37:05 +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
Victor Vieux
bba7d8adda Merge pull request #31793 from mlaventure/update-containerd 
Update containerd to version 949e6facb77383876aeff8a6944dde66b3089574
 2017-03-13 19:39:58 -07:00
Tõnis Tiigi
764e80e84c Merge pull request #31713 from nishanttotla/better-warnings 
Improve warnings when image digest pinning fails
 2017-03-13 17:57:06 -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
Justin Cormack
4108d6259a Merge pull request #31193 from docbobo/master-aarch64 
Support for debian-jessie on aarch64
 2017-03-14 00:45:30 +00:00
Brian Goff
aa733ba8a8 Merge pull request #31672 from dperny/service-logs-formatting 
Service logs formatting
 2017-03-13 19:08:55 -04:00
Nishant Totla
44855dff42
Improve warnings when image digest pinning fails 
Signed-off-by: Nishant Totla <nishanttotla@gmail.com>
 2017-03-13 15:16:35 -07:00