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

1902 commits

Author SHA1 Message Date
Brian Goff
2fc760496b Merge pull request #27648 from dnephin/swagger-gen-operations 
Generated more api types from swagger spec
 2016-10-31 15:33:16 -04:00
Laura Frank
ba4e0c328f Updating aws-sdk-go to version 1.4.22 
Signed-off-by: Laura Frank <ljfrank@gmail.com>
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-31 09:23:45 -07:00
Daniel Nephin
181562c2e5 Generate ContainerWait response from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:19:53 -04:00
Daniel Nephin
2732b8a9bb generate AuthResponse type from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:16:03 -04:00
Daniel Nephin
f196cf6a09 Generate container update response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:16:02 -04:00
Daniel Nephin
01883c136d Add an IDResponse type 
Generated from a swagger spec and use it for container exec response

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:16:02 -04:00
Daniel Nephin
bad849fc82 Generate container create response from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:16:02 -04:00
Daniel Nephin
29df3bdb11 Use a config to generate swagger api types 
Moves the resposne types to a package under api/types

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:13:41 -04:00
Daniel Nephin
5c2498fd3c Generate VolumesCreateRequest from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:13:41 -04:00
Daniel Nephin
bc75738545 Generate ErrorResponse struct from swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:13:41 -04:00
Daniel Nephin
d459e83b1c Generate VolumeList response from the swagger spec 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-31 11:13:41 -04:00
Qiang Huang
e6866492c4 Fix bunch of typos 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
 2016-10-29 15:03:26 +08:00
Sebastiaan van Stijn
cff976a0b8 Merge pull request #27844 from LK4D4/fix_build_rpm 
project: fix build rpm
 2016-10-28 16:50:58 -07:00
Alexander Morozov
bf0fe87fe6 project: fix build rpm 
* change workdir for accessing install-binaries.sh
* use other gopath for binaries to preserve sources
* add sources of proxy and grimes to rpc spec
* use dynamic proxy with -linkmode external in deb and rpm

Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-28 14:34:17 -07:00
Vincent Demeester
f860289131 Merge pull request #27369 from cezarsa/hc 
Add --health-* flags to service create and update
 2016-10-28 21:59:52 +02:00
Brian Goff
f391f9c3b9 Merge pull request #27860 from vdemeester/update-go-connections-vendor 
Update go-connections vendoring
 2016-10-28 12:01:59 -07:00
Michael Crosby
1e989abefb Merge pull request #26659 from yongtang/26341-fixed-cidr-multiple-addresses-bridge 
Fix issue for `--fixed-cidr` when bridge has multiple addresses
 2016-10-28 11:05:01 -07:00
Vincent Demeester
609c183ae7
Update go-connections vendoring 
This makes possible to use IPv6 addresses in the `--publish` flag of
docker (`run`, …)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-10-28 09:35:30 -07:00
Cezar Sa Espinola
fd657a10d0
vendor: update swarmkit 
Signed-off-by: Cezar Sa Espinola <cezarsa@gmail.com>
 2016-10-28 00:37:39 -02:00
Tibor Vass
4e6cb66ecc Merge pull request #27774 from runcom/vendor-distr 
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc
 2016-10-27 17:07:03 -07:00
Sebastiaan van Stijn
33474a11fe Merge pull request #25820 from crosbymichael/prom 
Add metrics output to docker
 2016-10-27 16:44:26 -07:00
Michael Crosby
3343d234f3 Add basic prometheus support 
This adds a metrics packages that creates additional metrics.  Add the
metrics endpoint to the docker api server under `/metrics`.

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

Add metrics to daemon package

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>

api: use standard way for metrics route

Also add "type" query parameter

Signed-off-by: Alexander Morozov <lk4d4@docker.com>

Convert timers to ms

Signed-off-by: Michael Crosby <crosbymichael@gmail.com>
 2016-10-27 10:34:38 -07:00
Yong Tang
fc62ad6b95 Vendor libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d 
This fix updates libnetwork to f4338b6f1085ccfe5972e655cca8a1d15d73439d.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-27 09:13:25 -07:00
Darren Stahl
f9adce18c7 Update hcsshim to v0.5.2 
Signed-off-by: Darren Stahl <darst@microsoft.com>
 2016-10-26 15:39:35 -07:00
Yong Tang
bb568f8097 Revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421 
This fix revendor swarmkit to 0ec7c6ee4b3185ec4e3d6bd65f8f5542b1761421.

Related docker PR and issues:
(#27567)
(#25437)
(#26988)
(#25644)

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
 2016-10-26 06:49:39 -07:00
Antonio Murdaca
78a429a97a
vendor docker/distribution fbb70dc3a14ca65cdac3aaf5e5122b03b42f6fbc 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-26 10:55:50 +02:00
Sebastiaan van Stijn
77f4c30a21 Merge pull request #27748 from amitkris/uprev_certificate_transparency 
Uprev google/certificate-transparency to include Solaris support
 2016-10-25 16:21:06 -07:00
Tibor Vass
280eadf9bf Merge pull request #27735 from justincormack/completions-tgz 
Add shell completions to tgz
 2016-10-25 15:46:45 -07:00
Amit Krishnan
16db092af2 Uprev google/certificate-transparency to include Solaris support 
Signed-off-by: Amit Krishnan <krish.amit@gmail.com>
 2016-10-25 13:14:57 -07:00
Alexander Morozov
36f47aa252 Merge pull request #27519 from justincormack/proxy-build 
Build docker-proxy from git checkout like other external binaries
 2016-10-25 08:54:13 -07:00
Justin Cormack
1c6f5b5fff Add shell completions to tgz 
Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-25 13:43:55 +01:00
Justin Cormack
3996975b08 Build docker-proxy from git checkout like other external binaries 
This means we can vendor libnetwork without special casing, and
it is built the same way as the other external binaries.

Signed-off-by: Justin Cormack <justin.cormack@docker.com>
 2016-10-25 13:13:22 +01:00
Sebastiaan van Stijn
ba41a5edac Merge pull request #27223 from mlaventure/merge-experimental 
Make experimental a runtime flag
 2016-10-24 16:58:32 -07:00
Kenfe-Mickael Laventure
7781a1bf0f Make experimental a runtime flag 
Signed-off-by: Kenfe-Mickael Laventure <mickael.laventure@gmail.com>
 2016-10-24 15:20:01 -07:00
Vincent Demeester
67b85f9d26 Merge pull request #26354 from KingEmet/fixbranch 
make GetAll use client.List as the source of truth
 2016-10-24 14:25:24 -07:00
Sebastiaan van Stijn
3c385b9f6b Merge pull request #27117 from dnephin/swagger-gen 
Add swagger.yaml and generate a few types from the spec
 2016-10-21 18:15:28 -07:00
Sebastiaan van Stijn
32b541e443 Merge pull request #27405 from tonistiigi/fix-fifo2 
Fix issues with fifos blocking on open
 2016-10-21 09:44:33 -07:00
allencloud
3cff9e0267 revendor go-units to update more accurate time display 
Signed-off-by: allencloud <allen.sun@daocloud.io>
 2016-10-21 11:05:11 +08:00
Tonis Tiigi
6d26464502 Fix issues with fifos blocking on open 
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
 2016-10-20 17:02:02 -07:00
Aaron Lehmann
12a4ed0317 Vendor swarmkit in master 
Also, update libnetwork and grpc.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
 2016-10-20 13:49:22 -07:00
Aaron Lehmann
2c620d0aa2 Merge pull request #27287 from mavenugo/pluginv2-sk2 
Allow multiple handlers to support network plugins in swarm-mode
 2016-10-20 13:43:04 -07:00
Daniel Nephin
4bfa2e634c Exclude generated types from linting. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Daniel Nephin
6f7b69b63f Generate plugin types from the swagger spec. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Daniel Nephin
02e1ffd76c Add whitespace and create a script to run generation 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-10-20 13:24:23 -07:00
Vincent Demeester
13fd75c3dd Merge pull request #27470 from runcom/expose-exec-pid 
record pid of exec'd process
 2016-10-20 21:36:21 +02:00
Michael Crosby
ffa0446e8b Merge pull request #27556 from LK4D4/unify_install 
project: unify way of installing runc and containerd
 2016-10-20 10:13:40 -07:00
Alexander Morozov
179479c6cd project: unify way of installing runc and containerd 
Signed-off-by: Alexander Morozov <lk4d4@docker.com>
 2016-10-20 08:50:02 -07:00
Antonio Murdaca
1808348136
record pid of exec'd process 
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
 2016-10-20 17:06:11 +02:00
Vincent Demeester
a4125e2265 Merge pull request #27514 from crosbymichael/update-init-oct18 
Update docker-init to 74341e923bdf06cfb6b70cf54089
 2016-10-20 16:58:26 +02:00
Tõnis Tiigi
9f30c28d21 Merge pull request #26983 from aaronlehmann/logrus-wrapped-errors 
Fix problems with wrapped errors in logrus
 2016-10-19 10:16:01 -07:00