Tibor Vass
32b776d0d8
Merge pull request #31102 from vdemeester/add-yongtang-to-maintainers
...
Add Yong Tang to maintainers
2017-02-16 14:31:18 -08:00
Vincent Demeester
c7cf5fcf6c
Add Yong Tang to maintainers
...
This adds Yong Tang as a maintainer for
docker/docker, as was proposed and
voted on the maintainers mailinglist.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-16 23:09:09 +01:00
Daniel Nephin
3e53ecaaae
Merge pull request #31085 from vdemeester/sort-stack-ls
...
Sort `docker stack ls` by name
2017-02-16 14:23:48 -05:00
Vincent Demeester
c31f73abfd
Merge pull request #29001 from darrenstahlmsft/WindowsOnLinux
...
Block pulling Windows images on non-Windows daemons
2017-02-16 19:57:54 +01:00
Tõnis Tiigi
bd81a16df0
Merge pull request #31002 from vdemeester/images-remove-handle-tag-digest
...
reference: handle combination of tag and digest in ImageDelete
2017-02-16 10:49:04 -08:00
Brian Goff
7f0b833621
Merge pull request #31054 from darrenstahlmsft/WaitOOBE
...
Windows: Wait for OOBE to prevent crashing during host update
2017-02-16 11:18:25 -05:00
Vincent Demeester
55e2ed2a65
Merge pull request #31073 from aboch/naip
...
Release the network attachment on allocation failure
2017-02-16 16:36:28 +01:00
Vincent Demeester
387ff3c41d
Merge pull request #30746 from yongtang/29936-validate-insecure-registry
...
Validate insecure registry (`--insecure-registry`) values
2017-02-16 14:53:51 +01:00
Vincent Demeester
97d85127c2
Sort docker stack ls
by name
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-16 14:30:39 +01:00
Alessandro Boch
91820b6941
Release the network attachment on allocation failure
...
- otherwise the attachment task will stay in store and
consume IP addresses and there is no way to remove it.
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-16 05:21:06 -08:00
Madhu Venugopal
136e400a4c
Merge pull request #31016 from aboch/vnd
...
Vendoring libnetowrk @5537cb4
2017-02-16 04:30:55 -08:00
Vincent Demeester
0fbfeb17e5
reference: handle combination of tag and digest in ImageDelete
...
If you remove an image with digest+tag, it will fail because it wont
find it in the reference store (where digest+tag -> digest). Let's
make sure we do the same in ImageDelete, stripping the tag if
digest+tag are present.
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-16 10:48:40 +01:00
Brian Goff
d26cf30a60
Merge pull request #31056 from tonistiigi/build-cache-fix
...
Reset stdin config before running build actions
2017-02-15 18:02:57 -05:00
Alexander Morozov
d52350d662
Merge pull request #30416 from stevenh/linux-mount-fixes
...
Fix linux mount calls not applying propagation type changes
2017-02-15 14:10:54 -08:00
Darren Stahl
e128a65685
Windows: Wait for OOBE to prevent crashing during host update
...
Signed-off-by: Darren Stahl <darst@microsoft.com>
2017-02-15 14:01:54 -08:00
Alexander Morozov
f18bc25fa1
Merge pull request #29819 from vdemeester/service-validate-publish-simple-syntax
...
Make sure we validate simple syntax on service commands
2017-02-15 12:31:46 -08:00
Tonis Tiigi
0f293f9eb3
Reset stdin config before running build actions
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com>
2017-02-15 11:49:17 -08:00
Alexander Morozov
abe6a073c7
Merge pull request #28638 from yongtang/28626-improve-error-handling
...
Improve error handling of experimental features in non-experimental mode
2017-02-15 11:00:03 -08:00
Victor Vieux
ee560bd748
Merge pull request #30303 from allencloud/rewrite-reload
...
refactor config reload in daemon
2017-02-15 09:40:55 -08:00
Victor Vieux
3167bb8629
Merge pull request #29957 from ilianaw/amazonlinux-rpms
...
Build the docker-engine RPM for Amazon Linux
2017-02-15 09:40:03 -08:00
Victor Vieux
07aaa71806
Merge pull request #31040 from BSWANG/master
...
fix docker stack omit external volume's "nocopy" parameter
2017-02-15 09:35:07 -08:00
Anusha Ragunathan
ce0f9b5e10
Merge pull request #30861 from runcom/fix-plug-errcheck
...
plugin: check errors
2017-02-15 07:50:27 -08:00
Steven Hartland
b3b14b97b1
Fix linux mount calls not applying propagation type changes
...
Propagation type changes must be done as a separate call, in the
same way as read only bind mounts.
To fix this:
1. Ensure propagation type change flags aren't included in other calls.
2. Apply propagation type change in a separate call.
Also:
* Make it clear which parameters are ignored by passing them as empty.
* Add tests to ensure Mount options are applied correctly.
Fixes #30415
Signed-off-by: Steven Hartland <steven.hartland@multiplay.co.uk>
2017-02-15 14:15:09 +00:00
allencloud
75f5d63ec8
rewrite reload code
...
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-15 21:57:27 +08:00
Brian Goff
946787e85e
Merge pull request #30922 from dperny/fix-log-error-handling-return-error
...
Fix both logs commands to correctly handle errors
2017-02-15 08:41:42 -05:00
Justin Cormack
3b5ed562fc
Merge pull request #30971 from dargor/allow_sync_file_range2
...
Allow sync_file_range2 on supported architectures.
2017-02-15 13:00:50 +00:00
bingshen.wbs
4fe611958c
fix docker stack volume's nocopy parameter
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2017-02-15 19:46:27 +08:00
Vincent Demeester
ed003ffbe5
Merge pull request #31029 from BSWANG/master
...
fix docker daemon reload bug
2017-02-15 10:06:18 +01:00
Vincent Demeester
e8b92f154d
Merge pull request #30832 from allencloud/update-swaggeryml-on-cluster-status-code
...
remove 400 and 404 for get nodes endpoint and add 503 for secret update
2017-02-15 09:45:44 +01:00
Antonio Murdaca
3716dd2272
plugin: check errors
...
Signed-off-by: Antonio Murdaca <runcom@redhat.com>
2017-02-15 09:35:36 +01:00
bingshen.wbs
51870c7e92
fix docker daemon reload bug
...
Signed-off-by: bingshen.wbs <bingshen.wbs@alibaba-inc.com>
2017-02-15 10:58:09 +08:00
Sebastiaan van Stijn
3dc87714d1
Merge pull request #30524 from mstanleyjones/30149_update_plugin_apidocs
...
Update plugin_volume apidocs for v2
2017-02-14 15:27:04 -08:00
Drew Erny
f19b0d72d1
fix docker logs error handling
...
Previously, `docker logs` (and by extension, `docker service logs`) had
an error in the way they returned errors that occurred after a stream
had already been started. Specifically, the errors were added verbatim
to the HTTP response, which caused StdCopy to fail with an esoteric
error. This change updates StdCopy to accept errors from the source
stream and then return those errors when copying to the destination
stream.
Signed-off-by: Drew Erny <drew.erny@docker.com>
2017-02-14 14:38:42 -08:00
Yong Tang
e49589505a
Validate insecure registry (--insecure-registry
) values
...
This fix is based on:
https://github.com/docker/docker/issues/29936#issuecomment-277494885
Currently the insecure registry is only checked to see if it contains
scheme (`http(s)://`) or not. No fully validation is done and this
caused many confusions like in #29936 .
This fix tries to address the issue.
This fix adds additional validation so that an insecure registry
is validated to make sure it is in `host:port` format where host
could be IPv4/IPv6 or a host name, and port could be an integer
between 0-65535.
Additional unit tests have been added.
This fix is related to #29936 .
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-14 13:13:23 -08:00
Sebastiaan van Stijn
fddab1444f
Merge pull request #30921 from anusha-ragunathan/debug_docs
...
Add plugin socket related debug docs.
2017-02-14 13:10:23 -08:00
Brian Goff
e70227e6d2
Merge pull request #30873 from albers/completion-fix-start--checkpoint
...
Fix bash completion for `start --checkpoint`
2017-02-14 16:00:15 -05:00
Brian Goff
03db46362e
Merge pull request #30941 from sdurrheimer/zsh-completion-service-logs
...
Add zsh completion for 'docker service logs' command
2017-02-14 15:59:19 -05:00
Brian Goff
4f6e4bfd02
Merge pull request #30943 from sdurrheimer/zsh-completion-checkpoint
...
Add zsh completion for 'docker checkpoint' commands
2017-02-14 15:58:45 -05:00
Brian Goff
da9a162301
Merge pull request #30945 from sdurrheimer/zsh-completion-plugin
...
Add zsh completion for missing 'docker plugin' commands and options
2017-02-14 15:57:25 -05:00
Brian Goff
0464441fb1
Merge pull request #30952 from yongtang/02122017-swagger-attachable
...
Add `attachable` for network object in swagger api docs
2017-02-14 15:53:52 -05:00
Gabriel Linder
52d8f582c3
Allow sync_file_range2 on supported architectures.
...
Signed-off-by: Gabriel Linder <linder.gabriel@gmail.com>
2017-02-14 21:29:33 +01:00
Anusha Ragunathan
6b8ae52865
Add plugin socket related debug docs.
...
Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-02-14 12:13:48 -08:00
Alessandro Boch
5b6048fd63
Vendoring libnetowrk @5537cb4
...
Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-14 11:52:57 -08:00
Alexander Morozov
22472c8be5
Merge pull request #29702 from WeiZhang555/stats-all-format-name-panic
...
Send "Name" and "ID" when stating stopped containers
2017-02-14 10:48:42 -08:00
Vincent Demeester
24523d9b75
Merge pull request #30396 from sdurrheimer/zsh-completion-hide-legacy-commands
...
Zsh completion hide legacy commands
2017-02-14 19:42:25 +01:00
Akihiro Suda
9042dbdb3b
Merge pull request #30985 from yongtang/29936-distribution-update
...
Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
2017-02-14 12:25:57 +09:00
Akihiro Suda
eac68dbbbc
Merge pull request #30340 from ijrandom/master
...
Fix #30311 : dockerd leaks ExecIds on failed exec -i
2017-02-14 10:13:16 +09:00
Yong Tang
20141b5219
Update docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
...
This fix updates docker/distribution to b38e5838b7b2f2ad48e06ec4b500011976080621
from 545102ea07aa9796f189d82f606b7c27d7aa3ed3
Changes related to docker issue:
1. Validate insecure registry (`--insecure-registry`) values (30746)
This fix is related to 30746.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-13 16:37:47 -08:00
Misty Stanley-Jones
48ccdf1f7a
Update plugin_volume apidocs for v2
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-02-13 16:28:54 -08:00
Vincent Demeester
4163b5cbd5
Merge pull request #30983 from tianon/usr-bin-env-bash
...
Convert script shebangs from "#!/bin/bash" to "#!/usr/bin/env bash"
2017-02-13 20:48:05 +01:00