1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Commit graph

30804 commits

Author SHA1 Message Date
Boaz Shuster
e050f1760d Fix the create API when fromSrc has a bad URL
When sending a bad URL in the fromSrc parameter using cURL
the response will have status code 200 while it should have 404
or 500 (depends on the error).

This commit addresses this problem in the following ways:
 * Before, `src` was parsed using url.Parse and if the
   returned `url.Scheme` was empty it was set to 'http'
   and `url.Host` was set to `src`.
   This is bad because if `src` was 'web.com/tars/image1.tar'
   The `url.String()` returns 'web.com%2Ftars%2Fimage1.tar`
   which will cause the daemon to fail downloading the file
 * Before writing the "Downloading" message, the image
   is attempted to be downloaded and if there is no error
   the "Downloading" message is sent.

Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com>
2017-03-26 15:21:13 +03:00
Brian Goff
41650df87e Merge pull request from allencloud/sort-volume-drivers
sort volume drivers  and auth plugins in info response
2017-02-07 21:13:21 -05:00
Akihiro Suda
31f172bdb5 Merge pull request from vdemeester/pr-30602
Carry  : Bump go-units
2017-02-08 11:04:22 +09:00
Kenfe-Mickaël Laventure
1459dc573a Merge pull request from albers/completion-improve-plugin-enable
Improve bash completion for `docker plugin enable|disable`
2017-02-07 17:58:12 -08:00
Vincent Demeester
14790e4008 Merge pull request from godefroi/26937-fix-rfc5424-log-format-1
Add NILVALUE for STRUCTURED-DATA in RFC5424 logs
2017-02-07 23:22:39 +01:00
Sebastiaan van Stijn
91f36e4b8a Merge pull request from yongtang/02012017-man-expose-publish-filter
Update API history and man page for `--filter expose/publish`
2017-02-07 14:05:36 -08:00
Kenfe-Mickaël Laventure
9f8a7b6b45 Merge pull request from albers/completion-ps-filter-by-ports
Add bash completion for `docker ps --filter expose|publish`
2017-02-07 13:38:19 -08:00
Kenfe-Mickaël Laventure
a19ead01be Merge pull request from albers/completion-plugin-ls--filter
Add bash completion for `docker plugin ls --filter`
2017-02-07 13:32:29 -08:00
Vincent Demeester
254fc83cba Merge pull request from dmcgowan/distribution-reference-update-2
reference: use distribution reference and remove fork
2017-02-07 22:01:25 +01:00
Vincent Demeester
cb89d658dc
Bump go-units
To include  https://github.com/docker/go-units/pull/23
Fixes a unit test that fails because of it.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-07 21:58:56 +01:00
Daniel Nephin
1b4e2b7c87 Merge pull request from dnephin/fix-build-with-log-driver
Ignore the daemon log config when building images
2017-02-07 15:47:41 -05:00
Vincent Demeester
0daff908a8 Merge pull request from xulike666/update-vender-for-go-gelf
Update dependency for Graylog2/go-gelf
2017-02-07 21:40:08 +01:00
Brian Goff
5381f9f726 Merge pull request from yongtang/21845-duplicate-mount-point-volumes-from
Fix duplicate mount points for multiple `--volumes-from` in `docker run`
2017-02-07 14:58:51 -05:00
Derek McGowan
3a1279393f
Use distribution reference
Remove forked reference package. Use normalized named values
everywhere and familiar functions to convert back to familiar
strings for UX and storage compatibility.

Enforce that the source repository in the distribution metadata
is always a normalized string, ignore invalid values which are not.
Update distribution tests to use normalized values.

Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2017-02-07 11:08:37 -08:00
Derek McGowan
2bea87393b
Update swarmkit vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2017-02-07 11:08:36 -08:00
Aaron Lehmann
bbd4c87377 Merge pull request from kevinetc123/typo-2
fix some types on errors and form
2017-02-07 10:34:39 -08:00
Anusha Ragunathan
124b480967 Merge pull request from cpuguy83/plugin_upgrade_swagger
Update swagger spec for plugin upgrade
2017-02-07 10:32:40 -08:00
Misty Stanley-Jones
e0cc664cc3 Merge pull request from nathanleclaire/document_init
Document --init flag for docker run
2017-02-07 09:28:30 -08:00
Yong Tang
9526e5c6ae Fix duplicate mount point for --volumes-from in docker run
This fix tries to fix the issue raised in 21845. The issue with 21845
is that if multiple `--volumes-from` with the same destination has been
specified, then one volume will be overridden by the other. This will mess
up with volumes reference and prevent the overridden volume from
being removed at the end.

Issue 21845 was observed with `docker-compose` though it is possible to
emulate the same behavior with `docker` alone:
```
$ cat Dockerfile
FROM busybox
VOLUME ["/tmp/data"]
$ docker build -t vimage .
$ docker run --name=data1 vimage true
$ docker run --name=data2 vimage true
$ docker run --name=app --volumes-from=data1 --volumes-from=data2 -d busybox top
$ docker rm -f -v $(docker ps -aq)
$ docker volume ls
$ docker volume rm ...
```
NOTE: Second case:
```
$ cat Dockerfile
FROM busybox
VOLUME ["/tmp/data"]
$ docker build -t vimage .
$ docker run --name=data1 vimage true
$ docker run --name=data2 vimage true
$ docker run --name=app --volumes-from=data1 --volumes-from=data2 -v /tmp/data:/tmp/data -d busybox top
$ docker rm -f -v $(docker ps -aq)
$ docker volume ls
$ docker volume rm ...
```
NOTE: Third case: Combination of --volumes-from and `HostConfig.Mounts` (API only)

This fix tries to address the issue by return an error if duplicate
mount points was used with `--volumes-from`.

An integration test has been added.

This fix fixes 21845.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-07 08:30:56 -08:00
Yong Tang
9fc393615f Update API history and man page for --filter expose/publish
This fix updates API history and man page for
`docker ps --filter expose/publish`, from the feedback:
https://github.com/docker/docker/pull/27557#issuecomment-276832876

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-07 08:24:46 -08:00
Brian Goff
ae48cd04da Update swagger spec for plugin upgrade
This was added in 03c6949739 but spec was
not updated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
2017-02-07 11:21:54 -05:00
Vincent Demeester
09114fe9f0 Merge pull request from yongtang/30178-service-health-check-none
Fix issue where service healthcheck is `{}` in remote API
2017-02-07 17:17:26 +01:00
Sebastiaan van Stijn
c5a592a0a4 Merge pull request from vdemeester/carry-update-docker-stack-experimental
Update docker stack experimental notes
2017-02-07 08:11:26 -08:00
Vincent Demeester
f3da980a45 Merge pull request from allencloud/add-400-status-code-for-events-endpoint
add status code 400 for api endpoint /events
2017-02-07 17:02:50 +01:00
Sebastiaan van Stijn
0a51ad2586 Merge pull request from Microsoft/jjh/makeshortcut
Windows: Make.ps1 default to build binaries
2017-02-07 07:39:33 -08:00
Vincent Demeester
3225150b16
Update docker stack experimental notes
Update command usage and help.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2017-02-07 15:17:47 +01:00
kaiwentan
ac9c47e26f fix some types on errors and form
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
2017-02-07 20:29:32 +08:00
Aaron.L.Xu
79d47a3bb7 fetch the latest code with zero-harm but good-readability for Graylog2/go-gelf
update vendor.conf for github.com/Graylog2/go-gelf

Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-02-07 17:27:17 +08:00
Sebastiaan van Stijn
09e99ef1fc Merge pull request from tophj-ibm/fix-manpages-p-z
ppc64le and s390x fixes for manpages
2017-02-06 21:53:19 -08:00
Sebastiaan van Stijn
9e80a2a457 Merge pull request from aaronlehmann/swarm-leave-docs-fix
Fix grammatical error in swarm_leave.md
2017-02-06 21:33:12 -08:00
Sebastiaan van Stijn
7c7be84238 Merge pull request from aboch/gn
getAllNetworks unnecessary walks all the networks
2017-02-06 20:28:30 -08:00
Aaron Lehmann
248b1c23d3 Fix grammatical error in swarm_leave.md
Correct this sentence so it reads correctly. "to on a manager" should be
"on a manager".

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-06 17:31:55 -08:00
Alessandro Boch
5d71cc01b6 getAllNetworks unnecessary walks all the networks
- libnetwork controller Networks() already returns
  a copy list. Also Networks() correctly skips any
  network which ahs already been marked for deletion
  while getNetworks implementation bypass this.

Signed-off-by: Alessandro Boch <aboch@docker.com>
2017-02-06 16:37:51 -08:00
Victor Vieux
41864ca0ec Merge pull request from stevvooe/validate-mounts-at-start
cluster/executor: check mounts at start
2017-02-06 15:01:48 -08:00
Christopher Jones
5bec1b6864 added ppc64le and s390x fixes for manpages
Fixes manpages for p and z by downloading a specific version
of go instead of relying on the distro version.

Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com>
2017-02-06 17:51:37 -05:00
Victor Vieux
94c4c68607 Merge pull request from andrewhsu/golang-1.7.5-for-manpages
use golang 1.7.5 for building man pages
2017-02-06 14:48:28 -08:00
Alexander Morozov
90709776c5 Merge pull request from yongtang/28005-docker-stats-header-windows
Fix Windows `docker stats` showing Linux headers
2017-02-06 14:09:23 -08:00
Alexander Morozov
d38753303a Merge pull request from tg123/master
Windows: return err instead of panic when convert string to utf16
2017-02-06 14:00:00 -08:00
Andrew Hsu
1c7a66eda7 remove musl-dev in man/Dockerfile.armhf
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-02-06 13:32:21 -08:00
Stephen J Day
92899ffac8
cluster/executor: check mounts at start
While it is important to not create controllers for an invalid task,
certain properties should only be checked immediately before use. Early
host validation of mounts prevents resolution of the task Executor when
the mounts are not relevant to execution flow. In this case, we have a
check for the existence of a bind mount path in a creation function that
prevents a task controller from being resolved. Such early validation
prevents one from interacting directly with a controller and result in
unnecessary error reporting.

In accordance with the above, we move the validation of the existence of
host bind mount paths to the `Controller.Start` phase. We also call
these "checks", as they are valid mounts but reference non-existent
paths.

Signed-off-by: Stephen J Day <stephen.day@docker.com>
2017-02-06 13:09:53 -08:00
Derek McGowan
24698a07cb
Update distribution vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
2017-02-06 13:06:52 -08:00
Alexander Morozov
dc15fe8a34 Merge pull request from tiborvass/stacktrace-debug-mode
Show stacktrace in daemon logs only if 500 internal error
2017-02-06 12:41:50 -08:00
Alexander Morozov
e06ae6f419 Merge pull request from yongtang/29975-compose-network-attachable
Add compose support of `attachable` in networks
2017-02-06 12:27:44 -08:00
Anusha Ragunathan
0113128b2a Merge pull request from allencloud/add-status-code-404-for-plugin-in-api-doc
add status code 404 for plugin api endpoint enable and disable
2017-02-06 11:53:17 -08:00
Alexander Morozov
b11f988dd0 Merge pull request from NickrenREN/daemon-register
remove Register return value
2017-02-06 11:47:17 -08:00
Alexander Morozov
d4136eb525 Merge pull request from tianon/prompt-for-confirmation
Fix "command.PromptForConfirmation" to accept "enter" for the "N" default
2017-02-06 11:44:45 -08:00
Andrew Hsu
a6886bfc52 use precompiled go from google, needs debian to work
Signed-off-by: Andrew Hsu <andrewhsu@docker.com>
2017-02-06 11:29:25 -08:00
Tõnis Tiigi
00d2057698 Merge pull request from justincormack/yamlup
Update Go Yaml
2017-02-06 11:14:55 -08:00
Brian Goff
1d3f6e4aaf Merge pull request from aboch/vnd
Vendoring libnetwork @802895f
2017-02-06 13:20:51 -05:00
Tibor Vass
f7d9bb6248 Show stacktrace in daemon logs only if 500 internal error
Signed-off-by: Tibor Vass <tibor@docker.com>
2017-02-06 10:13:21 -08:00