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

32422 commits

This branch
This branch
All branches
Author SHA1 Message Date
Tõnis Tiigi
ad846a136a Merge pull request #32959 from simonferquel/tar-filemode-windows 
Respect tar entries modes when rewriting them on Windows
 2017-05-16 11:45:42 -07:00
Sebastiaan van Stijn
b5f4fc7162 Merge pull request #33202 from AkihiroSuda/fix-it-on-swarm 
integration-cli-on-swarm/README.md: add a note about Docker->Moby
 2017-05-16 18:59:28 +02:00
Tõnis Tiigi
c93a48e138 Merge pull request #33214 from aaronlehmann/pull-prefer-digest 
Prefer digest over tag on pull
 2017-05-16 09:56:00 -07:00
Brian Goff
d12b2387d7 Merge pull request #33209 from cpuguy83/continue_on_err 
Add continue on error in mountspec backport
 2017-05-16 12:54:13 -04:00
Sebastiaan van Stijn
f944183c75 Merge pull request #33023 from gdevillele/pr-fix-prune-filter 
daemon returns errors when receiving unsupported prune filters
 2017-05-16 16:55:10 +02:00
Aaron Lehmann
0bff591bb0 Prefer digest over tag on pull 
If a reference passed to the pull code contains both a tag and a digest,
currently the tag is used instead of the digest in the request to the
registry. This is the wrong behavior. Change it to favor the digest.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-15 17:17:27 -07:00
Sebastiaan van Stijn
6ef7afce83 Merge pull request #33190 from zhangxiaoyu-zidif/format-for-server 
server.go: format for
 2017-05-16 01:28:04 +02:00
Aaron Lehmann
df4ca50805 Merge pull request #32490 from aaronlehmann/start-first-test-failure 
Increase health check timeout for TestAPISwarmServicesUpdateStartFirst
 2017-05-15 16:23:05 -07:00
Sebastiaan van Stijn
f6c00f6e80 Merge pull request #33148 from cyli/doc-update-node-cluster-tls-info 
Update the CLI docs to display whether a root rotation is in progress
 2017-05-16 01:06:08 +02:00
Sebastiaan van Stijn
7535462b77 Merge pull request #32730 from abhishek7/hack-folder-readme-32373 
Adding a README.md for the hack folder.
 2017-05-15 23:53:43 +02:00
Sebastiaan van Stijn
4dbea104ca Merge pull request #33185 from tonistiigi/docs-build-target 
docs: add docs for build —target
 2017-05-15 22:14:54 +02:00
Kenfe-Mickaël Laventure
04eb1f0cac Merge pull request #33198 from vdemeester/remove-unused-opts 
Remove unused opts (moved to docker/cli)
 2017-05-15 12:51:40 -07:00
Brian Goff
d6e1cb7cbf Add continue on error in mountspec backport 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-15 15:49:07 -04:00
Tibor Vass
203feeed86 Merge pull request #33208 from johnstep/fix-windows-client-build 
Fix make.ps1 client build for Windows
 2017-05-15 12:45:13 -07:00
John Stephens
632a8635a0
Fix make.ps1 client build for Windows 
Always clone the client to the docker directory, even if the specified
client repository is a fork. This is simpler than modifying the build
command to specify the package path of the fork.

Signed-off-by: John Stephens <johnstep@docker.com>
 2017-05-15 12:38:10 -07:00
Brian Goff
55ed80f78a Merge pull request #33200 from thaJeztah/remove-unused-key-file 
Remove unused launchpad key file
 2017-05-15 14:19:19 -04:00
Brian Goff
2c45392b8f Merge pull request #33119 from nhorman/devmapper-fixes 
Devmapper fixes for cookie generation and error reporting (fixes  #33050)
 2017-05-15 13:18:52 -04:00
Tonis Tiigi
33054be31b docs: add missing cache-from man docs 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-05-15 09:58:49 -07:00
Tonis Tiigi
3377664e94 docs: add docs for build —target 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-05-15 09:56:53 -07:00
Kenfe-Mickaël Laventure
ba52bb0fd1 Merge pull request #32502 from tonistiigi/git-allow-pr-number 
Allow specifying any remote ref in git checkout URLs
 2017-05-15 09:34:54 -07:00
Abhishek Sharma
99c1456647
Adding a README.md for the hack folder. 
Signed-off-by: Abhishek Sharma <abhishek@asharma.me>
 2017-05-15 17:06:35 +02:00
Akihiro Suda
63d4000e97 integration-cli-on-swarm/README.md: add a note about Docker->Moby 
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp>
 2017-05-15 14:37:05 +00:00
Sebastiaan van Stijn
4d8234fb10 Merge pull request #33170 from aaronlehmann/vendor-swarmkit-1ede4f8 
Vendor swarmkit ae29cf2
 2017-05-15 16:16:46 +02:00
Sebastiaan van Stijn
6cea2e5206 Merge pull request #32821 from cpuguy83/32613_fix_volspec_backport 
Fix issue backporting mount spec to pre-1.13 obj
 2017-05-15 15:58:31 +02:00
Brian Goff
3183031581 Merge pull request #32987 from allencloud/add-swarm-get-unlock-key-test-in-client 
add swarm get unlock key test for client package
 2017-05-15 09:56:43 -04:00
Sebastiaan van Stijn
3b9a6309c8
Remove unused launchpad key file 
Commit d841da9379 removed
the dependency on libzfs-dev from the Dockerfile.

This key file was only used for the PPA used to
install libzfs-dev, and is now no longer
needed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-15 15:51:18 +02:00
Justin Cormack
d841da9379 Merge pull request #33197 from thaJeztah/remove-libzfs-dev-dependency 
Remove zfs from static builds
 2017-05-15 14:48:38 +01:00
Sebastiaan van Stijn
6bffb585cd Merge pull request #32856 from darrenstahlmsft/RemoveResourceComments 
Remove comments and unused structures in Windows resources
 2017-05-15 15:28:51 +02:00
Sebastiaan van Stijn
23359fd403 Merge pull request #33131 from johnstep/windows-build-client-temp 
Build client on Windows in a temporary directory
 2017-05-15 15:22:00 +02:00
Vincent Demeester
306074572c Remove unused opts (moved to docker/cli) 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2017-05-15 14:38:58 +02:00
Sebastiaan van Stijn
7fd8a9382c Merge pull request #32996 from dperny/service-logs-support-details 
Fix Ambigious Logs Format and Add Support for Details in Service Logs
 2017-05-15 13:57:44 +02:00
Sebastiaan van Stijn
99b5fadd0c Merge pull request #33184 from dnephin/doc-arg-before-from 
Document arg before from
 2017-05-15 13:35:23 +02:00
Sebastiaan van Stijn
8022c5fdd1
Remove zfs from static builds 
The libzfs-dev package is not needed for the static builds,
and only used for ubuntu packages, so removing from
the Dockerfile.

This resolves an issue where build fails due to the PPA
having changed.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2017-05-15 13:22:52 +02:00
Vincent Demeester
8a03eb0b6c Merge pull request #33146 from Microsoft/jjh/TestAPIStatsNoStreamGetCpu 
Fix flaky TestAPIStatsNoStreamGetCpu
 2017-05-15 11:21:53 +02:00
zhangxiaoyu-zidif
1ab62a0b4d server.go: format for 
Signed-off-by: zhangxiaoyu-zidif <zhang.xiaoyu33@zte.com.cn>
 2017-05-15 07:12:28 +08:00
Doug Davis
5072b22c5f Merge pull request #33188 from allencloud/fix-nits-in-function-comments 
fix typos in function comments
 2017-05-14 08:17:28 -04:00
allencloud
4a98f9ef7f fix typos in function comments 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-05-14 13:05:41 +08:00
Kenfe-Mickaël Laventure
4e0fdc9098 Merge pull request #33179 from tonistiigi/fix-from-scratch 
Fix resetting image metadata between stages for scratch case
 2017-05-13 21:17:02 -07:00
Kenfe-Mickaël Laventure
190c6e8cf8 Merge pull request #33182 from cyli/exclusive-root-pools-in-daemon 
Use exclusive root pools if a CA cert file is specified in the daemon
 2017-05-13 21:15:42 -07:00
allencloud
a86023eaa9 add swarm get unlock key test for client package 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2017-05-14 11:09:19 +08:00
Sebastiaan van Stijn
20255ade29 Merge pull request #32700 from jphuynh/more-maintainer-deprecation 
MAINTAINER deprecation follow up. Relates to #25466
 2017-05-13 17:28:52 +02:00
Sebastiaan van Stijn
c56cfbaf96 Merge pull request #33174 from thaJeztah/update-authors 
Update AUTHORS and mailmap
 2017-05-13 17:25:31 +02:00
Aaron Lehmann
0a377b5f56 Update go-metrics to match swarmkit's dependency 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:40:46 -07:00
Aaron Lehmann
721b7a7fad Vendor swarmkit ae29cf2 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 17:36:11 -07:00
Daniel Nephin
83a4afe264 Document arg before from 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-12 18:45:08 -04:00
Tibor Vass
680084b2a2 Merge pull request #32874 from cpuguy83/metrics_plugins 
Add support for metrics plugins
 2017-05-12 15:44:34 -07:00
Ying Li
ddd5278b07 Use exclusive root pools if a CA cert file is specified in the daemon 
Signed-off-by: Ying Li <ying.li@docker.com>
 2017-05-12 14:43:34 -07:00
Tonis Tiigi
b192218503 Fix resetting image metadata between stages for scratch case 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2017-05-12 12:00:55 -07:00
Drew Erny
68f21418ac Change log details encoding format and support details on service logs 
URL query encode log details, so that characters like spaces don't make
log parsing ambiguous. Add a helper function to parse these details to a
map, if needed

Add support for details on service logs

Signed-off-by: Drew Erny <drew.erny@docker.com>
 2017-05-12 10:53:44 -07:00
Aaron Lehmann
47436e9628 TestAPISwarmServicesUpdateStartFirst: Increase timeout on health check command 
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2017-05-12 10:42:29 -07:00