fffe24070c
Fix validation errors in swagger.yaml
...
- Some objects were missing `type: "object"`
- Some examples had invalid null values (go-swagger validation
doesn't support x-nullable, so they have just been removed)
- ImageSummary example was out of date
- Removed timeNano because YAML interprets it as a float, not
a long (sigh)
- Tidy up archive errors
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: e5e1c7feef3e692c21fc2745368bbcae38e02270
Component: engine
2016-11-07 11:03:10 -08:00
b577b180f8
Add logo to swagger.yaml
...
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: cd0c0d06665c98d7c80cf77760dc5043ab72d466
Component: engine
2016-11-07 11:03:09 -08:00
6a317cb5f3
Merge pull request #25974 from kunalkushwaha/mount-add
...
correct handling of volumes while service update.
Upstream-commit: c1cdfe78f6eb71b33afbba4dd2a6a713a959177f
Component: engine
2016-11-07 10:34:22 -08:00
feddd2acda
Merge pull request #25983 from jhorwit2/jah/ps-refactor
...
Add -a option to service/node ps
Upstream-commit: 89ef0f21510cf14eb78f2c0677cc936882c5a261
Component: engine
2016-11-07 17:33:10 +01:00
7b37b03f40
Merge pull request #28059 from lixiaobing10051267/masterDockerInfo
...
Rectify Images display information for docker 1.10.3
Upstream-commit: e00e7e9582b53a5e19a7e300b37ecbedf9e4e881
Component: engine
2016-11-07 09:05:34 -05:00
e23667bf0f
Merge pull request #27279 from dongluochen/lbapi_integration
...
Support health aware load balancing
Upstream-commit: bee2beeaad7f466ce05f2d53e0bc41844d212cb3
Component: engine
2016-11-07 02:42:51 -08:00
a3e6ad3f37
Merge pull request #28104 from Microsoft/jjh/nogoroot
...
Don't set GOROOT in dockerfile.Windows
Upstream-commit: b34b29e2379b51edcf45bf9cb70cf1cb4a409608
Component: engine
2016-11-07 17:37:21 +09:00
9156f6f7cf
Merge pull request #28093 from albers/completion-run--cpus
...
Add bash completion for `docker {run,create} --cpus`
Upstream-commit: de78ed432ba526ca463d191e3ac143bc107c00f5
Component: engine
2016-11-07 17:31:40 +09:00
a76d4f99db
Merge pull request #28094 from albers/completion-system-df
...
Add bash completion for `docker system df`
Upstream-commit: 67a247154c60ef924ca41a57f4720d4b9f3a5f65
Component: engine
2016-11-07 17:31:27 +09:00
cd10215557
Merge pull request #28096 from albers/completion-prune
...
Add bash completion for new prune commands
Upstream-commit: afb1119c851c5da7b85bc5d51f9d642113f994a5
Component: engine
2016-11-07 09:30:56 +01:00
88cb957770
Merge pull request #28097 from albers/completion-fix-inspect--type
...
Fix bash completion for `docker inspect --type`
Upstream-commit: d049c6f8a147ed4dd0a7806eb14d4ae8f5f6a722
Component: engine
2016-11-07 09:30:04 +01:00
cdf2135b1c
Merge pull request #28102 from yongtang/11052016-docs-build-Step
...
Update docs for the output of `docker build` (Step 1/...)
Upstream-commit: 5b2cedf11edf095b1de17d43752edacd5a2e6669
Component: engine
2016-11-07 09:28:08 +01:00
bd9109a83b
Merge pull request #28075 from yongtang/27958-docs-follow-up
...
Follow up docs update for PR #27958
Upstream-commit: b8140249b45712e667fa7ab1ea5d4997bb533f69
Component: engine
2016-11-07 09:21:40 +01:00
26a4e23cf3
Merge pull request #28065 from lixiaobing10051267/masterServerEror
...
add error information to distinguish different test scene
Upstream-commit: 325eaa7ba475233586d74831c446bb341f48fe8a
Component: engine
2016-11-07 09:16:16 +01:00
3a37a471f0
Merge pull request #28020 from YuPengZTE/devArg
...
Align arg with other cli
Upstream-commit: 6e0893f304ec5dd994f81ef4c41cc174d35d6a1d
Component: engine
2016-11-07 08:58:51 +01:00
b9b5178daa
Add -a option to service/node ps
...
Signed-off-by: Josh Horwitz <horwitzja@gmail.com >
Upstream-commit: 139fff2bf0ebe12b61871ba8ec8be8d51c2338db
Component: engine
2016-11-06 07:40:39 -05:00
a017bc90a9
Don't set GOROOT in dockerfile.Windows
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: 3e75c5b68e8d311f4a29cca285560d2e49eae769
Component: engine
2016-11-05 21:14:12 -07:00
c6c5a0aaa0
Remove Windows CI stubs from hack/
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: d945441e23e8c7a5ccd541062da8e206264127fb
Component: engine
2016-11-05 21:01:06 -07:00
8c052677e4
Update docs for the output of docker build (Step 1/...)
...
PR 24978 adds hint of of progress to the output of `docker build`
for 1.13, in the format of
```
Step 1/5 ...
...
Step 2/5 ...
...
```
Though some of the docs hasn't been updated.
This fix did a grep in docs and updated the related places.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 7d529492cc8b902bbf2e1f293546e3b19134db1b
Component: engine
2016-11-05 19:05:19 -07:00
e3849dda91
Fix bash completion for docker inspect --type
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: d65934a8b85b961b95fcb1443f2191bef23df17b
Component: engine
2016-11-05 11:22:47 -07:00
f51ce2d41b
Add bash completion for new prune commands
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 8099280cd81bf1e6e0cbaf8a3ba728ec1ccb1d50
Component: engine
2016-11-05 10:39:33 -07:00
e6605af98d
Add bash completion for docker system df
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 09172051fc90c55bb06359b60918d15feb9aecc4
Component: engine
2016-11-05 10:12:35 -07:00
4a58c855ef
Add bash completion for docker {run,create} --cpus
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 9268bbaeeaebe68a5ccd2f32277059e80aac2d8c
Component: engine
2016-11-05 09:59:55 -07:00
705e095e8b
Align arg with other cli
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: c09277d5c336594fe384cf3ae5fc76eafdb80728
Component: engine
2016-11-05 13:47:02 +08:00
b91cea3478
Vendor libnetwork a98901aebe7ce920b6fbf02ebe5c3afc9ca975b8.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: aba4190612a2e4f0400e0e992de81aa382299f9b
Component: engine
2016-11-04 21:50:56 -07:00
393d61cc88
dynamic service binding.
...
Signed-off-by: Dong Chen <dongluo.chen@docker.com >
Upstream-commit: ca81f6ee7c74a3bf27dc9b044742961f4ef78094
Component: engine
2016-11-04 21:50:56 -07:00
0453189408
Follow up docs update for PR 27958
...
This fix is a follow up for any additional docs update for PR 27958.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: f82f8eeaf8bffffbea9a05fb061a3bf528432a78
Component: engine
2016-11-04 20:18:40 -07:00
d2784c37b9
Merge pull request #28085 from aaronlehmann/remove-comment
...
distribution: Remove misleading comment
Upstream-commit: c5ceb0f945d390500a0045b14ffe4dcecfe46a85
Component: engine
2016-11-04 19:57:57 -07:00
5a8e3be256
distribution: Remove misleading comment
...
Remove the following comment in pullV2Tag:
// NOTE: not using TagService.Get, since it uses HEAD requests
// against the manifests endpoint, which are not supported by
// all registry versions.
This is actually not an issue, because TagService.Get does a fallback to
GET if HEAD fails. It has done this ever since TagService was added to
the distribution API, so this comment was probably based on an early
version of TagService before it was merged, or was always a
misunderstanding.
However, we continue to use ManifestService.Get instead because it
saves a round trip. The manifest can be retrieved directly instead of
resolving the digest first.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: 99c59d5988d20a6722224da918fdec299d3aaded
Component: engine
2016-11-04 17:10:47 -07:00
f6a55fc731
Add Andrew and Alessandro as curator
...
They're helping out with triaging, so
just making this official :)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 7eb4a1d61683c550254169425ab0171f272d1df3
Component: engine
2016-11-04 17:08:07 -07:00
97826ed120
Merge pull request #28081 from LK4D4/update_for_solaris
...
vendor: update package for solaris support
Upstream-commit: 1c62d8619d3b629cd8aae3bf44a5eb3e17c1cfb9
Component: engine
2016-11-04 17:01:16 -07:00
8491327d68
Merge pull request #24194 from Microsoft/WindowsCpuCount
...
Windows: Added processor count option
Upstream-commit: e8c9063353e8afa26a8aea796893a78ba8fcc41c
Component: engine
2016-11-04 16:13:43 -07:00
0606b2f6d5
Merge pull request #28077 from aluzzardi/swarmkit-revendoring
...
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
Upstream-commit: bb1153a613933dc25e2a112416ead9106ed00f4c
Component: engine
2016-11-04 14:59:05 -07:00
3db46dc6b5
vendor: update package for solaris support
...
Update includes next packages:
* golang.org/x/sys 8f0908ab3b2457e2e15403d3697c9ef5cb4b57a9
* github.com/fsnotify/fsnotify v1.2.11
* github.com/tonistiigi/fifo b4c3a126bac4051ae3fa83bfcb3c60ab7a9da0dd
Signed-off-by: Alexander Morozov <lk4d4@docker.com >
Upstream-commit: 553b0b9731c5b2b75af1fa27c17f2a19cf2a0160
Component: engine
2016-11-04 14:39:47 -07:00
cdb85c6084
Merge pull request #28068 from tophj-ibm/switch-all-golang-download-links
...
switch all go download links to https://golang.org/dl
Upstream-commit: 6087185676ef838c20af3dace1bbd442b6bdb53c
Component: engine
2016-11-04 14:21:58 -07:00
854000b31e
Merge pull request #28074 from dmcgowan/force-sha512-sign-repos
...
Use sha512 when gpg signing builds
Upstream-commit: 3a9322e9ec9ed64b1e165fb901fde0f8021471d3
Component: engine
2016-11-04 14:08:52 -07:00
20cafdbd7e
Merge pull request #28010 from vieux/fix_experimental_client
...
always add but hide experimental cmds and flags
Upstream-commit: f6edbdf8835359a83e9d5786ffe09d176609fb07
Component: engine
2016-11-04 13:49:19 -07:00
c8300bf35f
Windows: Add cpu count option
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 4e15420b9be50ddd7fa65e5c7f9b732777f9cc35
Component: engine
2016-11-04 13:38:50 -07:00
425de017f6
Merge pull request #28070 from runcom/seccomp-path-fixes
...
Seccomp path fixes
Upstream-commit: d7d0bc1d583c544b72e3a41827d9cc6ccb964438
Component: engine
2016-11-04 20:36:35 +00:00
ac2b6ee292
Merge pull request #27737 from justincormack/no-ambient-1.13
...
Revert ambient capabilities for 1.13
Upstream-commit: cac13fc131c4e539a412ef46d3828dc79453c524
Component: engine
2016-11-04 12:52:21 -07:00
fc88fcd016
Revendor swarmkit to 2eaae1ab6800f8521236e01bafb2667d2ec5371f
...
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 014eeb539beaf84c69dc2a97b8ffd32551219d0e
Component: engine
2016-11-04 12:26:37 -07:00
9dcd59a93e
Revendor go-memdb to floridoo/go-memdb's fork (608dda3b1410a73eaf3ac8b517c9ae7ebab6aa87)
...
We are temporarily using a fork containing a PR that hasn't been merged
upstream yet.
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com >
Upstream-commit: 9322636c8926f155a10d9679e364e3f8e86203d6
Component: engine
2016-11-04 12:26:37 -07:00
a4610ccc0a
Merge pull request #28064 from lixiaobing10051267/masterInstallation
...
modify URL because installation directory removed
Upstream-commit: da499758b8f4fd96213889964ca206b2396bed48
Component: engine
2016-11-04 12:06:37 -07:00
ffbf855e39
update cobra and use Tags
...
Signed-off-by: Victor Vieux <vieux@docker.com >
Upstream-commit: d34ca0178e42cddc760316bbcb6a3aa8bea8b3ed
Component: engine
2016-11-04 12:04:14 -07:00
44dc3f21c6
Merge pull request #28072 from Microsoft/jjh/api124
...
Windows: Allow API v1.24
Upstream-commit: 24d822d179df9a7ab668d280efbd64a8b1735fe2
Component: engine
2016-11-04 11:57:42 -07:00
cee03f5dd3
Merge pull request #28073 from albers/completion-service-create--hostname
...
Add bash completion for `docker service create --hostname`
Upstream-commit: c859a9ff1fe6a1caa384c012bc007ab601e50ed7
Component: engine
2016-11-04 11:57:08 -07:00
20a1f51ba7
Merge pull request #28057 from aaronlehmann/lint-api
...
Run lint on most of api/types
Upstream-commit: ab2593457991fa037346544b91d0bdb64963d5e2
Component: engine
2016-11-04 11:56:02 -07:00
9ce11130e0
cli/info: fix seccomp warning
...
also reword seccomp warning around default seccomp profile
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: c68e75e51d58167b5b21e77bbc7b701fe0888096
Component: engine
2016-11-04 19:25:51 +01:00
04676aa104
docs: update for new secopts struct in GET /info
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com >
Upstream-commit: e6ec90608ca06431920afa6d4c56130af9c02a28
Component: engine
2016-11-04 19:25:51 +01:00
889abdab10
Add bash completion for docker service create --hostname
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: 42f8562984809b26bbae541cc005e36a2febc1cb
Component: engine
2016-11-04 19:08:17 +01:00
