Commit Graph
29281 Commits
Author SHA1 Message Date
Justin Cormack 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
Justin Cormack 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Andrew Hsu 9eb244a92c skip solaris and allow dry run control points
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
Upstream-commit: f60541069cca1a4c886f5c2198d2ccd07f4ee764
Component: engine
2016-11-22 01:42:52 -08:00
yupeng 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
Vincent Demeester 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
Antonio Murdaca 6ac00da856 hack/dockerfile/binaries-commits: use full commit hash for docker info
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
Upstream-commit: fa15d5ed0f96592b49c2e25c06e92d51999fb29b
Component: engine
2016-11-22 08:59:57 +01:00
Steve Durrheimer 33a0af4678 Add zsh completion for 'docker image ls --filter reference'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 15134b8d361895654b471a50c32f59ebc4a719ea
Component: engine
2016-11-22 08:01:45 +01:00
Steve Durrheimer 41c72b0885 Add zsh completion for 'dockerd --userland-proxy-path'
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 97e189292278de10f2590f52eaf9b382c54bc99b
Component: engine
2016-11-22 07:57:31 +01:00
yupeng 28a6abec82 error strings should not be capitalized or end with punctuation
Signed-off-by: yupeng <yu.peng36@zte.com.cn>
Upstream-commit: fc11efa2dbf72bb493a24650860220a2d4b07c5e
Component: engine
2016-11-22 14:53:11 +08:00
Reficul 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
Andrea Luzzardi abd795e582 service logs: Support no-follow mode
Signed-off-by: Andrea Luzzardi <aluzzardi@gmail.com>
Upstream-commit: c2d435e4f05d262aaa3d4d5cc2fe8965377eebdf
Component: engine
2016-11-21 18:02:13 -08:00
Tonis Tiigi 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
Darren Stahl 9d0ad3a9bc Ensure vmcompute.dll exists during daemon start
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: 000366f1a72a8fde2c25b4606821605780a55c02
Component: engine
2016-11-21 17:40:31 -08:00
Brian Goff 77b1914252 Handle run --rm against older daemons on the cli
For previous versions of Docker, `--rm` was handled client side, as such
there was no support in the daemon for it.
Now it is handled daemon side, but we still need to handle the case of a
newer client talking to an older daemon.

Falls back to client-side removal when the daemon does not support it.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: f4bb8c51de3a52bdbc3c3e7be426e6bb90feb421
Component: engine
2016-11-21 20:39:04 -05:00
yupeng 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
Tibor Vass 0ef1fc07ad vendor go-connections to error out if unix socket path is too long
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: e2e7ab655fa429d491096eea82952c4a6a1569d9
Component: engine
2016-11-21 16:34:10 -08:00
Tibor Vass f20a7bc47c plugins: fix some tests
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: a08ffa0e934e5f8b95855cc5bd0cc2a6b3cf4091
Component: engine
2016-11-21 16:34:10 -08:00
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Sebastiaan van Stijn 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
Tibor Vass f460bac81d plugins: do not try to contact disabled plugin
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 84e58e2f89b3dea30738f92edcabef4336d0cff6
Component: engine
2016-11-21 14:52:14 -08:00
Tibor Vass 4ae83fca35 plugins: support for host networking
Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 99124c055ac5d145737fe432ffc2e62e320d3d96
Component: engine
2016-11-21 14:52:14 -08:00
Tibor Vass 14aacd334b plugins: linux capabilities and device creation
In the plugin manifest, Capabilities has been moved to
Linux.Capabilities to avoid confusion with Interface.Types[i].Capability

A DeviceCreation boolean has also been added to the manifest. This could
be changed in the future to be specific to a major number.

Signed-off-by: Tibor Vass <tibor@docker.com>
Upstream-commit: 9f239281b1b02ed46f98af1eb39bc9b2165073fa
Component: engine
2016-11-21 14:52:14 -08:00
Victor Vieux 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
Alessandro Boch 780b0ff3be Vendor libkv @ 1d84310
Signed-off-by: Alessandro Boch <aboch@docker.com>
Upstream-commit: f9cff5e267b5e6eb9046286e8a4e43552da605eb
Component: engine
2016-11-21 14:07:51 -08:00
Victor Vieux 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
Victor Vieux 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
Alexander Morozov 424f2463fd Merge pull request #28673 from aboch/vnd
Vendoring libnetwork @dd0ddde
Upstream-commit: 9bd7189527a35829f4dd8e3eb630f570b466801f
Component: engine
2016-11-21 13:46:14 -08:00
Andrew Hsu 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
Victor Vieux 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
Anusha Ragunathan 33bbc7177a Check for valid daemon in TearDownTest.
SetupTest could fail creating a Daemon object (eg, out of space when
creating daemon root dir). In such a case, TearDownTest fails when
accessing the daemon object. This commit adds the required nil check.

Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 5890091cc02ca75425c8635cbe4ec6c7ccd1663b
Component: engine
2016-11-21 13:29:13 -08:00
Alexander Morozov 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
Anusha Ragunathan c21adc5da9 Add HTTP client timeout.
Signed-off-by: Anusha Ragunathan <anusha@docker.com>
Upstream-commit: 83ca993c154d56e03d6f95a3f8351c48b3ed3e29
Component: engine
2016-11-21 13:11:40 -08:00
Vincent Demeester 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
Daniel Nephin 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
Darren Stahl 6364691c1f Update hcsshim
Signed-off-by: Darren Stahl <darst@microsoft.com>
Upstream-commit: baac0ef67f97e007db03b4edaaa756e4a89678fc
Component: engine
2016-11-21 11:45:32 -08:00
Alessandro Boch 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
Madhu Venugopal 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
Brian Goff 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
Vincent Demeester 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
Victor Vieux 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
Sebastiaan van Stijn 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
Victor Vieux 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
Derek McGowan 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
Vincent Demeester 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
Sebastiaan van Stijn 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