910c4f2b83
Update swagger.yaml with changes to API
...
Up to and including 673c5ee559b05adb9ef6e0e1d6135ff83522e38d
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 44c50807c6eadcb2371cc6bf8ba5f66ba9dcbe97
Component: engine
2016-11-22 12:49:38 +00:00
ff7908609b
Add version information to swagger.yaml
...
- Tidied up copy
- API version is now mandatory
- Links to previous API versions
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: c97f67dbab50f0efbf3c1e6a2862d29c76c9aec1
Component: engine
2016-11-22 12:49:38 +00:00
e5912f7d7e
Rename Remote API to Engine API
...
Implementation of https://github.com/docker/docker/issues/28319
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: f0d55cd081c6e8ad2a8222c787d54f9aae15723f
Component: engine
2016-11-22 12:49:38 +00:00
7e2e397a31
Move API reference to new location
...
See: https://github.com/docker/docker.github.io/pull/606
Also:
- Add missing redirects to API reference pages
- Remove v1.25 and 1.26, because they are being replaced with
swagger generated docs.
- Remove all other docs which aren't reference material, because
this can live in docker/docker.github.io
Signed-off-by: Ben Firshman <ben@firshman.co.uk >
Upstream-commit: 993854f58fa4132ff82c2e1ffe291d90b301db5a
Component: engine
2016-11-22 12:47:25 +00:00
b123ea8afd
Merge pull request #28651 from YuPengZTE/devMD002
...
First header should be a top level header
Upstream-commit: 48c3df015d3118b92032b7bdbf105b5e7617720d
Component: engine
2016-11-22 13:11:37 +01:00
33dbfcc591
Merge pull request #28659 from xuzhenglun/master
...
bugfix: incorrect ErrConnectFailed Comparison
Upstream-commit: d1258c761a9d2fac6c7830c77c7d8f91426bada3
Component: engine
2016-11-22 13:01:05 +01:00
b13fc57c66
Merge pull request #28682 from tonistiigi/stdin-close
...
Fix race on sending stdin close event
Upstream-commit: 3373227f368129070866df89777f03aca564f24b
Component: engine
2016-11-22 11:02:47 +00:00
7a0760001e
Merge pull request #28704 from YuPengZTE/devGenerate
...
hack/swagger-gen.sh is not exist
Upstream-commit: 0bcdeaefcfb47e7c75ec0cf78c029e002ae3e880
Component: engine
2016-11-22 11:01:19 +00:00
f2d9f7807d
Merge pull request #27628 from flixr/deb_armhf_ubuntu-xenial
...
build debian package for armhf ubuntu-xenial
Upstream-commit: f67c8163d4a298c651126e707e048e8975c8b4f5
Component: engine
2016-11-22 11:47:42 +01:00
1f31dcb95c
Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
...
Update hcsshim to v0.5.9
Upstream-commit: fc488328b1f97165d2b80944a8f9887ae7268194
Component: engine
2016-11-22 10:48:20 +01:00
5f4c3b65c6
hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: c471b7f2435f2cfa84d42876c35a04097593e864
Component: engine
2016-11-22 16:32:32 +08:00
d6934ae086
Merge pull request #28343 from albers/completion-build--network
...
Add bash completion for `docker build --network`
Upstream-commit: 7ca953e66ef3f71e9b909edbc7f0f23e00494427
Component: engine
2016-11-22 09:29:42 +01:00
3bfc791696
fix incorrect ErrConnectFailed comparison
...
Signed-off-by: Reficul <xuzhenglun@gmail.com >
Upstream-commit: d5dc9b8b1f5e693cfb3aace06e08e7fc6eb798d7
Component: engine
2016-11-22 10:42:55 +08:00
c0d4c1f04f
Fix race on sending stdin close event
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 4e262f63876018ca78d54a98eee3f533352b0ac9
Component: engine
2016-11-21 17:43:01 -08:00
163c2e9b09
First header should be a top level header
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 1e65db4206ba89af24400fbf9047b25ec98cfd02
Component: engine
2016-11-22 09:33:21 +08:00
5e08f57e6b
Merge pull request #27621 from AkihiroSuda/machine-install-bundle
...
contrib: add docker-machine-install-bundle.sh
Upstream-commit: e350d44dbe3eb808818876d115f0e56f9f303da9
Component: engine
2016-11-22 01:10:53 +01:00
dc6af48000
Merge pull request #28640 from andrewhsu/apt-mirror-arm
...
allow replacing httpredir mirror for arm
Upstream-commit: d95c174d2f85b31a3c072720dfd397d03d23fb97
Component: engine
2016-11-22 00:54:04 +01:00
39e4cf8c6c
Merge pull request #28628 from albers/completion-images-f-reference
...
Add bash completion for `docker images --filter reference`
Upstream-commit: fff1885a4bb82f351c274939ad5469e3bb1e090b
Component: engine
2016-11-22 00:52:34 +01:00
d34c5ada47
Merge pull request #28486 from vdemeester/docs-service-templating
...
Add documentation about templating support on…
Upstream-commit: 700f61841049bca424906b74d80e56d6f1c11248
Component: engine
2016-11-22 00:50:45 +01:00
629b1e5dab
Merge pull request #28664 from thaJeztah/update-service-ps-reference
...
Update service ps reference for "--no-trunc"
Upstream-commit: da4a2f16a0c5914f2bee60a8dc18f9b4975c3cf2
Component: engine
2016-11-22 00:48:03 +01:00
4ce562265c
Merge pull request #28677 from dnephin/remove-deploy-experimental
...
Move `docker stack` out of experimental
Upstream-commit: eac91a19d632dc82b04f19eb11f83ed1dcefb8ae
Component: engine
2016-11-21 14:33:35 -08:00
a4da4522af
Merge pull request #28328 from aaronlehmann/duration-opts
...
cli: Add valid suffixes for remaining duration options
Upstream-commit: 99a7289632974e4388ee09fbea2038410e713e0b
Component: engine
2016-11-21 14:03:00 -08:00
12ac08ce0b
Merge pull request #28504 from runcom/fix-info-route-secopt
...
api: types: do not remove old SecurityOptions struct
Upstream-commit: 3a6829257e970771a4be99783b93a803946443df
Component: engine
2016-11-21 13:55:07 -08:00
424f2463fd
Merge pull request #28673 from aboch/vnd
...
Vendoring libnetwork @dd0ddde
Upstream-commit: 9bd7189527a35829f4dd8e3eb630f570b466801f
Component: engine
2016-11-21 13:46:14 -08:00
14018d9149
allow replacing httpredir or deb mirror in jessie
...
Signed-off-by: Andrew Hsu <andrewhsu@docker.com >
Upstream-commit: 060196ee4cdf2d60800faef67662989d74f5c03a
Component: engine
2016-11-21 13:34:05 -08:00
b730897ea7
Merge pull request #28649 from allencloud/judge-locked-before-parsing-key
...
judge manager if locked before parsing key
Upstream-commit: 6e4a3c4546d50558d273f8ead7b8ee42ea9f9f20
Component: engine
2016-11-21 13:33:38 -08:00
78afb2b399
Merge pull request #28670 from cpuguy83/update_syslog_driver
...
re-vendor syslog log driver
Upstream-commit: 9326fb13890714c8003ce8105b53b75d51db54a0
Component: engine
2016-11-21 13:19:47 -08:00
f8729bb9ff
Merge pull request #28556 from ehazlett/container-secret-store
...
Fix target reference secrets and container secret store
Upstream-commit: 05963010ee2aa363bcbd6d925918a46dba02fd7d
Component: engine
2016-11-21 21:40:01 +01:00
2beb803d6c
Move docker stack out of experimental
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6df5baf30f96e5af3338551b9e632748d7886ead
Component: engine
2016-11-21 15:30:25 -05:00
6364691c1f
Update hcsshim
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: baac0ef67f97e007db03b4edaaa756e4a89678fc
Component: engine
2016-11-21 11:45:32 -08:00
7c7f67d5d1
Vendoring libnetwork @dd0ddde
...
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 948c7fdb943e89d7e08960eefb6ed030a0bab639
Component: engine
2016-11-21 11:44:58 -08:00
35302d40a0
Merge pull request #28562 from tomdee/bump-libnetwork
...
Update libnetwork version for IPv6 support
Upstream-commit: 111a95fb500194039cabf670b4cf5b62dcd9ed0e
Component: engine
2016-11-21 11:30:00 -08:00
65ee2f8e99
re-vendor syslog log driver
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 00caf03132a1bf1a2a7a389c5f23d6fc81f2bc0b
Component: engine
2016-11-21 14:24:53 -05:00
f3f3b8320e
Merge pull request #28466 from miaoyq/update-a-var-type
...
The type of 'ExportdPorts' should be 'nat.PortSet'
Upstream-commit: e349d3d330a419015e73f971acedb960be0cc24d
Component: engine
2016-11-21 20:23:10 +01:00
e3c013f930
Merge pull request #28663 from vdemeester/28633-do-not-panic-on-empty-network
...
Do not panic if network is nil
Upstream-commit: fb7e9a908b117afb1b3e173cebef4679a6407172
Component: engine
2016-11-21 10:48:03 -08:00
46e8997e76
Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc
...
Update deprecation notes about v1 registry
Upstream-commit: 6cc645c938ffbe261e01a4bdafe7aabe9f0899f3
Component: engine
2016-11-21 19:16:38 +01:00
f81cd6d4f4
Merge pull request #28647 from WeiZhang555/dont-lock-client-version
...
Bugfix: set cli.manualOverride when env var not empty
Upstream-commit: 51c107b64fbaefab671b5d69a03ec9a5860459ef
Component: engine
2016-11-21 09:52:35 -08:00
6276c1c7ff
Update deprecation notes about v1 registry
...
Adds section about the hub deprecating the v1 protocol.
Adds note about intent to disable by default and remove support.
Signed-off-by: Derek McGowan <derek@mcgstyle.net > (github: dmcgowan)
Upstream-commit: c8f826f4077b15af30d8810f62abd517908bb712
Component: engine
2016-11-21 09:39:48 -08:00
2b291d4bab
Do not panic if network is nil
...
network is `nil` if the following case:
```
services:
foo:
image: nginx
networks:
mynetwork:
```
It's a valid compose so we should not panic.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 158388ef8d66723ec1f8ee4770d7488948234d16
Component: engine
2016-11-21 17:59:29 +01:00
c75246d4be
Merge pull request #28656 from vdemeester/update-docker-deploy-ref-doc
...
Update cli reference for docker {,stack} deploy
Upstream-commit: ca4d907851ad89545ff813b0bb854521fc3f8953
Component: engine
2016-11-21 17:46:08 +01:00
8ca29f7629
Update service ps reference for "--no-trunc"
...
The "--no-trunc" option toggles between showing/hiding
digests.
This updates the reference to show this difference.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 90993640f0e21a45874a9efc6b6236b589945d6e
Component: engine
2016-11-21 17:39:58 +01:00
a4b2e09289
Merge pull request #28539 from nishanttotla/pin-image-digest-ux
...
Suppressing digest for docker service ls/ps
Upstream-commit: 278e01d6de56e7ffb6f47db9dfca8fdb196a9643
Component: engine
2016-11-21 14:06:37 +01:00
1524794f61
Update cli reference for docker {,stack} deploy
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 88cdfc512b0737f6dd9eb5ad207fb68f9acdf51e
Component: engine
2016-11-21 12:36:31 +01:00
2bf8a1c8e2
build debian package for armhf ubuntu-xenial
...
Signed-off-by: Felix Ruess <felix.ruess@gmail.com >
Upstream-commit: 015e83a8da3ccf9f208f92d5d66e5dd159f75ad7
Component: engine
2016-11-21 12:34:20 +01:00
65878dd980
Merge pull request #28648 from YuPengZTE/devBareURL
...
fix the mistak of url format
Upstream-commit: 5c6e649fdecb0eb12a7f077b7dbfb3fe7c851123
Component: engine
2016-11-21 11:03:43 +01:00
92c12f5ddb
Bugfix: set cli.manualOverride when env var not empty
...
If env var "DOCKER_API_VERSION" is specified by user, we'll set
`cli.manualOverride`, before this, this field is always true due to
wrong logic.
Signed-off-by: Zhang Wei <zhangwei555@huawei.com >
Upstream-commit: 4d54d30477f2eb0f373fd2301cf4c3ecc1434d62
Component: engine
2016-11-21 17:31:46 +08:00
86d2b2a2e1
Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
...
Add support for healthcheck in compose to swarm
Upstream-commit: 3739c3bed37a3493a20bff3c9abb17561e1a732d
Component: engine
2016-11-21 10:28:37 +01:00
9fec0659ba
judge manager if locked before parsing key
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 89100c162b23791b4a64d142a11014257bf61fd0
Component: engine
2016-11-21 16:39:09 +08:00
55cdbbd2d1
Bare URL used
...
Signed-off-by: yupeng <yu.peng36@zte.com.cn >
Upstream-commit: 0655d5cd1f541fd13afc4c157f7e827ff2a30625
Component: engine
2016-11-21 16:30:09 +08:00
51fbd6182d
contrib: add docker-machine-install-bundle.sh
...
docker-machine-install-bundle.sh installs the bundle to Docker Machine instances.
This script helps developers to test the latest Docker with Swarm-mode enabled.
Usage:
$ docker-machine create -d some-driver dm01
..
$ docker-machine create -d some-driver dm05
$ make binary
$ contrib/docker-machine-install-bundle.sh install dm01 dm02 dm03 dm04 dm05
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: fa314aa52ee22d4f7b917236eb5a9d53d8fa0fdd
Component: engine
2016-11-21 07:13:11 +00:00
