Commit Graph

31631 Commits

Author SHA1 Message Date
466e8e21b6 Merge pull request #30776 from WeiZhang555/stats-all-format-name-panic-cli
Fix panic of "docker stats --format {{.Name}} --all"
Upstream-commit: f5116c680207a12ecd9c4fa654a1a5707e7ac89c
Component: engine
2017-02-08 11:40:06 -08:00
2eb6289303 Merge pull request #30453 from yongtang/30242-duplicate-network-name-inspect
Return error in case `docker network inspect` is ambiguous
Upstream-commit: 846b7878193a60bedc3be365a1c4937535d827aa
Component: engine
2017-02-08 09:18:31 -08:00
13953f645c Fix typo
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: e27838049d3ff3a8ba6ef360cf141d21ab317dc6
Component: engine
2017-02-08 07:58:46 -08:00
7ad0855c50 Randomly assign pull requests older than two weeks
Add a daily job to randomly assign pull requests which have been opened
for more than two weeks.

Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
Upstream-commit: d4f5fa29dbd29738a7da6e3c75609b033432a84f
Component: engine
2017-02-08 07:58:32 -08:00
94aaeac869 Merge pull request #30812 from allencloud/add-filters-for-plugin-list-in-swaggeryml
add filters for plugin list endpoint in swagger.yml
Upstream-commit: 98d34ae6063b4e50cb0f82757ab355292a5d29ec
Component: engine
2017-02-08 10:35:21 -05:00
8c15651879 remove 400 and 404 for get nodes endpoint and add 503 for secret update
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 5692a7ba3ddc2664bccf08aefee5bacf266def5b
Component: engine
2017-02-08 23:06:09 +08:00
dd8010e320 Extract daemon configuration and discovery to their own package
This also moves some cli specific in `cmd/dockerd` as it does not
really belong to the `daemon/config` package.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: db63f9370e26d725357c703cbaf9ab63cc7b6d0a
Component: engine
2017-02-08 09:53:38 +01:00
f25770c5ab Fix useless trailing backslash in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: 7027cd5b374da4a312736653b20a2baeb7247357
Component: engine
2017-02-08 08:11:20 +01:00
c312c36a18 Add cache invalidation in zsh completion when the DOCKER_HIDE_LEGACY_COMMANDS envvar changes
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
Upstream-commit: d41ceb9d738b7c463006a0ce1158839191dd746e
Component: engine
2017-02-08 08:10:34 +01:00
54fc6ec2bd add filters for plugin list endpoint in swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
Upstream-commit: 26649de086f38f7a74a0a78782c084c49fe41d89
Component: engine
2017-02-08 14:07:20 +08:00
cde9376903 Correct fmt.Fprintf and t.Fatalf
Signed-off-by: Helen Xie <chenjg@harmonycloud.cn>
Upstream-commit: 921002137aa877fc4730fefbd5d918adacb7adde
Component: engine
2017-02-08 12:32:40 +08:00
b520dbb06a Fix panic of "docker stats --format {{.Name}} --all"
This commit fixes panic when execute stats command:

* use --format {{.Name}} with --all when there're exited containers.
* use --format {{.Name}} while stating exited container.

The root cause is when stating an exited container, the result from the
api didn't contain the Name and ID field, which will make format
process panic.

Panic log is like this:

```
panic: runtime error: slice bounds out of range [recovered]
	panic: runtime error: slice bounds out of range

goroutine 1 [running]:
panic(0xb20f80, 0xc420014110)
	/usr/local/go/src/runtime/panic.go:500 +0x1a1
text/template.errRecover(0xc4201773e8)
	/usr/local/go/src/text/template/exec.go:140 +0x2ad
panic(0xb20f80, 0xc420014110)
	/usr/local/go/src/runtime/panic.go:458 +0x243
github.com/docker/docker/cli/command/formatter.(*containerStatsContext).Name(0xc420430160,
0x0, 0x0)
	/go/src/github.com/docker/docker/cli/command/formatter/stats.go:148
+0x86
reflect.Value.call(0xb9a3a0, 0xc420430160, 0x2213, 0xbe3657, 0x4,
0x11bc9f8, 0x0, 0x0, 0x4d75b3, 0x1198940, ...)
	/usr/local/go/src/reflect/value.go:434 +0x5c8
reflect.Value.Call(0xb9a3a0, 0xc420430160, 0x2213, 0x11bc9f8, 0x0, 0x0,
0xc420424028, 0xb, 0xb)
	/usr/local/go/src/reflect/value.go:302 +0xa4
text/template.(*state).evalCall(0xc420177368, 0xb9a3a0, 0xc420430160,
0x16, 0xb9a3a0, 0xc420430160, 0x2213, 0x1178fa0, 0xc4203ea330,
0xc4203de283, ...)
	/usr/local/go/src/text/template/exec.go:658 +0x530
```

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
Upstream-commit: 5a7b3c78e06081fb2d44b6f4296cb416ab91aaff
Component: engine
2017-02-08 10:26:52 +08:00
7a04a9d5d0 Merge pull request #30474 from allencloud/sort-volume-drivers
sort volume drivers  and auth plugins in info response
Upstream-commit: 41650df87e55c0d018c66d0d221920f87c343391
Component: engine
2017-02-07 21:13:21 -05:00
c9ee5a3f47 Return error in case docker network inspect is ambiguous
This fix is partially based on comment
https://github.com/docker/docker/issues/30242#issuecomment-273517205

Currently, `docker network inspect` relies on `FindNetwork()` which
does not take into consideration that multiple networks with the same
name might exist.

This fix propose to return `docker network inspect` in a similiar
fashion like other commands:
1. Lookup full ID
2. Lookup full name
3. Lookup partial ID
If multiple networks exist, an error will be returned.

NOTE: this fix is not a complete fix for the issue raised in
https://github.com/docker/docker/issues/30242#issuecomment-273517205
where SwarmKit is unable to update when multiple networks with the same
name exit.
To fix that issue requires multiple places when `FindNetwork()` is called.
Because of the impact of changing `FindNetwork()`, this fix focus on
the issue in `docker network inspect`.

A separate PR will be created to address
https://github.com/docker/docker/issues/30242#issuecomment-273517205

An integration test has been added.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: abf31ee0837ff80638f10b77df9025b6b6470253
Component: engine
2017-02-07 18:05:29 -08:00
14c3328b3b Merge pull request #30790 from vdemeester/pr-30602
Carry #30602 : Bump go-units
Upstream-commit: 31f172bdb50091be8880caac83046401bb43fc17
Component: engine
2017-02-08 11:04:22 +09:00
ac8bd0a614 Merge pull request #30642 from albers/completion-improve-plugin-enable
Improve bash completion for `docker plugin enable|disable`
Upstream-commit: 1459dc573a04b027826eb69e2f5ba59cd57aade0
Component: engine
2017-02-07 17:58:12 -08:00
6b54bc16cf Merge pull request #30694 from godefroi/26937-fix-rfc5424-log-format-1
Add NILVALUE for STRUCTURED-DATA in RFC5424 logs
Upstream-commit: 14790e4008c030626eeb8886c4578441af561cf0
Component: engine
2017-02-07 23:22:39 +01:00
1b9a800107 Merge pull request #30661 from yongtang/02012017-man-expose-publish-filter
Update API history and man page for `--filter expose/publish`
Upstream-commit: 91f36e4b8ae9040b6d6c425a8263936dc9873691
Component: engine
2017-02-07 14:05:36 -08:00
72f4f526e4 Merge pull request #30638 from albers/completion-ps-filter-by-ports
Add bash completion for `docker ps --filter expose|publish`
Upstream-commit: 9f8a7b6b452278605dabdb14936e0c6f38e98350
Component: engine
2017-02-07 13:38:19 -08:00
4c3e3cc52d Merge pull request #30640 from albers/completion-plugin-ls--filter
Add bash completion for `docker plugin ls --filter`
Upstream-commit: a19ead01bead960053cd8bf9c7660a4ec2c736a7
Component: engine
2017-02-07 13:32:29 -08:00
c355cec53c Merge pull request #30457 from dmcgowan/distribution-reference-update-2
reference: use distribution reference and remove fork
Upstream-commit: 254fc83cba90ed79c78f4cb0cb33aeeaff492798
Component: engine
2017-02-07 22:01:25 +01:00
e1911d98d5 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>
Upstream-commit: cb89d658dc6dca5f0efa21cac168ae82fea821d1
Component: engine
2017-02-07 21:58:56 +01:00
6df9f2365c Merge pull request #29552 from dnephin/fix-build-with-log-driver
Ignore the daemon log config when building images
Upstream-commit: 1b4e2b7c878fb69c1c96755e21a571e6d7b8e4bb
Component: engine
2017-02-07 15:47:41 -05:00
5eac19d80f Merge pull request #30780 from xulike666/update-vender-for-go-gelf
Update dependency for Graylog2/go-gelf
Upstream-commit: 0daff908a83d92114a51a8294114098ffbcf8fb6
Component: engine
2017-02-07 21:40:08 +01:00
22902a5639 Merge pull request #29563 from yongtang/21845-duplicate-mount-point-volumes-from
Fix duplicate mount points for multiple `--volumes-from` in `docker run`
Upstream-commit: 5381f9f726e50a392d6623973d232b63290789f9
Component: engine
2017-02-07 14:58:51 -05:00
2260389fe6 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)
Upstream-commit: 3a1279393faf78632bf169619d407e584da84b66
Component: engine
2017-02-07 11:08:37 -08:00
958fd45277 Update swarmkit vendor
Signed-off-by: Derek McGowan <derek@mcgstyle.net> (github: dmcgowan)
Upstream-commit: 2bea87393b7673fc88531851803f073198527021
Component: engine
2017-02-07 11:08:36 -08:00
1b4c4226e5 Merge pull request #30787 from kevinetc123/typo-2
fix some types on errors and form
Upstream-commit: bbd4c87377dab95e40f54c66d3603de825383d99
Component: engine
2017-02-07 10:34:39 -08:00
4bc2dda008 Merge pull request #30767 from cpuguy83/plugin_upgrade_swagger
Update swagger spec for plugin upgrade
Upstream-commit: 124b480967675bcf6a95fe98c4df42acae8e7038
Component: engine
2017-02-07 10:32:40 -08:00
fcde483797 Merge pull request #30523 from nathanleclaire/document_init
Document --init flag for docker run
Upstream-commit: e0cc664cc34959b301849378f3e98146b079fc5e
Component: engine
2017-02-07 09:28:30 -08:00
d6535af489 Support expanded ports in Compose loader
This commit adds support for expanded ports in Compose loader,
and add several unit tests for loading expanded port format.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: f07a28a54165b6a2e49e9d0e6d3a111252095cb5
Component: engine
2017-02-07 09:14:56 -08:00
5c8fdca78f Add expanded port syntax to Compose schema and types.
This commit adds expanded port syntax to Compose schema and types
so that it is possible to have
```
ports:
  - mode: host
    target: 80
    published: 9005
```

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
Upstream-commit: 60c1eaf8f08f904248cbfa0d07d850025a35e6d0
Component: engine
2017-02-07 09:12:55 -08:00
03b9460cf3 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>
Upstream-commit: 9526e5c6aebfaf8c8d18cefa0cf44e92b7ad5f77
Component: engine
2017-02-07 08:30:56 -08:00
49889e6daa 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>
Upstream-commit: 9fc393615f6aae1a70ba282123ee15afc23a6297
Component: engine
2017-02-07 08:24:46 -08:00
148d8c5f61 Update swagger spec for plugin upgrade
This was added in 03c694973968f63743ed53cef83d0b7455695081 but spec was
not updated.

Signed-off-by: Brian Goff <cpuguy83@gmail.com>
Upstream-commit: ae48cd04dacddbab50839be620b1f659ca322b7c
Component: engine
2017-02-07 11:21:54 -05:00
e827e3506f Merge pull request #30197 from yongtang/30178-service-health-check-none
Fix issue where service healthcheck is `{}` in remote API
Upstream-commit: 09114fe9f0fcfaa97be46c3142b8b64aacc94571
Component: engine
2017-02-07 17:17:26 +01:00
1be829bb74 Merge pull request #30789 from vdemeester/carry-update-docker-stack-experimental
Update docker stack experimental notes
Upstream-commit: c5a592a0a43ef3ce5a6d0644427cbe7011213f63
Component: engine
2017-02-07 08:11:26 -08:00
3f7730c74a Merge pull request #30734 from allencloud/add-400-status-code-for-events-endpoint
add status code 400 for api endpoint /events
Upstream-commit: f3da980a459c11a35248daa8a6be9919bf65fda2
Component: engine
2017-02-07 17:02:50 +01:00
edcb479225 Merge pull request #30639 from Microsoft/jjh/makeshortcut
Windows: Make.ps1 default to build binaries
Upstream-commit: 0a51ad2586a68ed7fd7e3547594630f07d8c9ee3
Component: engine
2017-02-07 07:39:33 -08:00
aad0552893 Update docker stack experimental notes
Update command usage and help.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: 3225150b164c97e5e67893e93f45888d552f4919
Component: engine
2017-02-07 15:17:47 +01:00
5a2fed241e fix some types on errors and form
Signed-off-by: kaiwentan <kaiwentan@harmonycloud.cn>
Upstream-commit: ac9c47e26f57a0fa2fed95a1fb1bf6c9410a3b60
Component: engine
2017-02-07 20:29:32 +08:00
0c640a030b Make sure we validate simple syntax on service commands
We ignored errors for simple syntax in `PortOpt` (missed that in the
previous migration of this code). This make sure we don't ignore
`nat.Parse` errors.

Test has been migrate too (errors are not exactly the same as before
though -_-)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
Upstream-commit: aa4ecd153b88644a53b23b7c46332d9b50007930
Component: engine
2017-02-07 12:45:47 +01:00
0bc7415047 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>
Upstream-commit: 79d47a3bb763689bb7ea64da8a24c8ecfa6181c8
Component: engine
2017-02-07 17:27:17 +08:00
a0487c75eb Merge pull request #30771 from tophj-ibm/fix-manpages-p-z
ppc64le and s390x fixes for manpages
Upstream-commit: 09e99ef1fcbbcb8f1551298244ad8ac214cf2625
Component: engine
2017-02-06 21:53:19 -08:00
207b36b0ce Merge pull request #30774 from aaronlehmann/swarm-leave-docs-fix
Fix grammatical error in swarm_leave.md
Upstream-commit: 9e80a2a457a93b625aea72db42bb2f820d2b5b10
Component: engine
2017-02-06 21:33:12 -08:00
d916d66338 Merge pull request #30773 from aboch/gn
getAllNetworks unnecessary walks all the networks
Upstream-commit: 7c7be8423842768d174f9091c7adfc2e89c1a24d
Component: engine
2017-02-06 20:28:30 -08:00
48134e2cad 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>
Upstream-commit: 248b1c23d37e1e32af66583f8d14d9f8742280ef
Component: engine
2017-02-06 17:31:55 -08:00
1a76374f64 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>
Upstream-commit: 5d71cc01b6bb089a70fa1e855943dab0d88439bb
Component: engine
2017-02-06 16:37:51 -08:00
404093c291 Merge pull request #30732 from stevvooe/validate-mounts-at-start
cluster/executor: check mounts at start
Upstream-commit: 41864ca0ecc5c515f870cae862c286bb38cc1bf6
Component: engine
2017-02-06 15:01:48 -08:00
1c501e8036 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>
Upstream-commit: 5bec1b686481244698474a0103c0994b25c5c79c
Component: engine
2017-02-06 17:51:37 -05:00