Commit graph

29217 commits

Author SHA1 Message Date
Ben Firshman
c97f67dbab
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>
2016-11-22 12:49:38 +00:00
Ben Firshman
f0d55cd081
Rename Remote API to Engine API
Implementation of https://github.com/docker/docker/issues/28319

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-11-22 12:49:38 +00:00
Ben Firshman
993854f58f
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>
2016-11-22 12:47:25 +00:00
Vincent Demeester
48c3df015d Merge pull request #28651 from YuPengZTE/devMD002
First header should be a top level header
2016-11-22 13:11:37 +01:00
Vincent Demeester
d1258c761a Merge pull request #28659 from xuzhenglun/master
bugfix: incorrect ErrConnectFailed Comparison
2016-11-22 13:01:05 +01:00
Justin Cormack
3373227f36 Merge pull request #28682 from tonistiigi/stdin-close
Fix race on sending stdin close event
2016-11-22 11:02:47 +00:00
Justin Cormack
0bcdeaefcf Merge pull request #28704 from YuPengZTE/devGenerate
hack/swagger-gen.sh is not exist
2016-11-22 11:01:19 +00:00
Sebastiaan van Stijn
f67c8163d4 Merge pull request #27628 from flixr/deb_armhf_ubuntu-xenial
build debian package for armhf ubuntu-xenial
2016-11-22 11:47:42 +01:00
Sebastiaan van Stijn
fc488328b1 Merge pull request #28671 from darrenstahlmsft/RevendorHcshim
Update hcsshim to v0.5.9
2016-11-22 10:48:20 +01:00
yupeng
c471b7f243 hack/swagger-gen.sh is not exist, it should be /hack/generate-swagger-api.sh
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-22 16:32:32 +08:00
Vincent Demeester
7ca953e66e Merge pull request #28343 from albers/completion-build--network
Add bash completion for `docker build --network`
2016-11-22 09:29:42 +01:00
Reficul
d5dc9b8b1f
fix incorrect ErrConnectFailed comparison
Signed-off-by: Reficul <xuzhenglun@gmail.com>
2016-11-22 10:42:55 +08:00
Tonis Tiigi
4e262f6387 Fix race on sending stdin close event
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2016-11-21 17:43:01 -08:00
yupeng
1e65db4206 First header should be a top level header
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-22 09:33:21 +08:00
Sebastiaan van Stijn
e350d44dbe Merge pull request #27621 from AkihiroSuda/machine-install-bundle
contrib: add docker-machine-install-bundle.sh
2016-11-22 01:10:53 +01:00
Sebastiaan van Stijn
d95c174d2f Merge pull request #28640 from andrewhsu/apt-mirror-arm
allow replacing httpredir mirror for arm
2016-11-22 00:54:04 +01:00
Sebastiaan van Stijn
fff1885a4b Merge pull request #28628 from albers/completion-images-f-reference
Add bash completion for `docker images --filter reference`
2016-11-22 00:52:34 +01:00
Sebastiaan van Stijn
700f618410 Merge pull request #28486 from vdemeester/docs-service-templating
Add documentation about templating support on…
2016-11-22 00:50:45 +01:00
Sebastiaan van Stijn
da4a2f16a0 Merge pull request #28664 from thaJeztah/update-service-ps-reference
Update service ps reference for "--no-trunc"
2016-11-22 00:48:03 +01:00
Victor Vieux
eac91a19d6 Merge pull request #28677 from dnephin/remove-deploy-experimental
Move `docker stack` out of experimental
2016-11-21 14:33:35 -08:00
Victor Vieux
99a7289632 Merge pull request #28328 from aaronlehmann/duration-opts
cli: Add valid suffixes for remaining duration options
2016-11-21 14:03:00 -08:00
Victor Vieux
3a6829257e Merge pull request #28504 from runcom/fix-info-route-secopt
api: types: do not remove old SecurityOptions struct
2016-11-21 13:55:07 -08:00
Alexander Morozov
9bd7189527 Merge pull request #28673 from aboch/vnd
Vendoring libnetwork @dd0ddde
2016-11-21 13:46:14 -08:00
Andrew Hsu
060196ee4c allow replacing httpredir or deb mirror in jessie
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2016-11-21 13:34:05 -08:00
Victor Vieux
6e4a3c4546 Merge pull request #28649 from allencloud/judge-locked-before-parsing-key
judge manager if locked before parsing key
2016-11-21 13:33:38 -08:00
Alexander Morozov
9326fb1389 Merge pull request #28670 from cpuguy83/update_syslog_driver
re-vendor syslog log driver
2016-11-21 13:19:47 -08:00
Vincent Demeester
05963010ee Merge pull request #28556 from ehazlett/container-secret-store
Fix target reference secrets and container secret store
2016-11-21 21:40:01 +01:00
Daniel Nephin
6df5baf30f Move docker stack out of experimental
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-21 15:30:25 -05:00
Darren Stahl
baac0ef67f Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
2016-11-21 11:45:32 -08:00
Alessandro Boch
948c7fdb94 Vendoring libnetwork @dd0ddde
Signed-off-by: Alessandro Boch <aboch@docker.com>
2016-11-21 11:44:58 -08:00
Madhu Venugopal
111a95fb50 Merge pull request #28562 from tomdee/bump-libnetwork
Update libnetwork version for IPv6 support
2016-11-21 11:30:00 -08:00
Brian Goff
00caf03132 re-vendor syslog log driver
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2016-11-21 14:24:53 -05:00
Vincent Demeester
e349d3d330 Merge pull request #28466 from miaoyq/update-a-var-type
The type of 'ExportdPorts' should be 'nat.PortSet'
2016-11-21 20:23:10 +01:00
Victor Vieux
fb7e9a908b Merge pull request #28663 from vdemeester/28633-do-not-panic-on-empty-network
Do not panic if network is nil
2016-11-21 10:48:03 -08:00
Sebastiaan van Stijn
6cc645c938 Merge pull request #28615 from dmcgowan/update-v1-deprecation-doc
Update deprecation notes about v1 registry
2016-11-21 19:16:38 +01:00
Victor Vieux
51c107b64f Merge pull request #28647 from WeiZhang555/dont-lock-client-version
Bugfix: set cli.manualOverride when env var not empty
2016-11-21 09:52:35 -08:00
Derek McGowan
c8f826f407
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)
2016-11-21 09:39:48 -08:00
Vincent Demeester
158388ef8d
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>
2016-11-21 17:59:29 +01:00
Sebastiaan van Stijn
ca4d907851 Merge pull request #28656 from vdemeester/update-docker-deploy-ref-doc
Update cli reference for docker {,stack} deploy
2016-11-21 17:46:08 +01:00
Sebastiaan van Stijn
90993640f0
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>
2016-11-21 17:39:58 +01:00
Vincent Demeester
278e01d6de Merge pull request #28539 from nishanttotla/pin-image-digest-ux
Suppressing digest for docker service ls/ps
2016-11-21 14:06:37 +01:00
Vincent Demeester
88cdfc512b
Update cli reference for docker {,stack} deploy
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-11-21 12:36:31 +01:00
Felix Ruess
015e83a8da build debian package for armhf ubuntu-xenial
Signed-off-by: Felix Ruess <felix.ruess@gmail.com>
2016-11-21 12:34:20 +01:00
Sebastiaan van Stijn
5c6e649fde Merge pull request #28648 from YuPengZTE/devBareURL
fix the mistak of url format
2016-11-21 11:03:43 +01:00
Zhang Wei
4d54d30477 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>
2016-11-21 17:31:46 +08:00
Vincent Demeester
3739c3bed3 Merge pull request #28294 from vdemeester/compose-swarm-healthcheck
Add support for healthcheck in compose to swarm
2016-11-21 10:28:37 +01:00
allencloud
89100c162b judge manager if locked before parsing key
Signed-off-by: allencloud <allen.sun@daocloud.io>
2016-11-21 16:39:09 +08:00
yupeng
0655d5cd1f Bare URL used
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
2016-11-21 16:30:09 +08:00
Akihiro Suda
fa314aa52e 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>
2016-11-21 07:13:11 +00:00
Lei Jitang
103f2e56bf Merge pull request #28644 from zhukj/daemon-config
close the file
2016-11-21 13:50:26 +08:00