Commit graph

30948 commits

Author SHA1 Message Date
John Howard
f48f1ff34c Windows: make.ps1 emit commit ID
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-09 20:01:23 -08:00
John Howard
8eb0af1a0c Windows: Temporarily disable TestBuildLastModified
Signed-off-by: John Howard <jhoward@microsoft.com>
2017-02-09 18:13:20 -08:00
Aaron Lehmann
b7a2d85316 reference: Handle combination of tag and digest in AddReference
With the switchover to the unified reference package, AddReference no
longer does the right thing when passed a reference that has both a
digest and a tag. It would put both the digest in the tag in the
reference stored in the repositories.json file, which isn't the right
format, and would mean that neither "docker run" nor docker services
could locate the image. This meant that a simple "docker service create"
command like "docker service create --name foo busybox top" would create
a service that immediately went into a restart loop, because it couldn't
use the image that had been pulled.

Fix AddReference to strip out the tag when both a tag and digest are
specified. We do this because we don't necessarily want to overwrite the
tag - when both a digest and tag are specified, the tag is only
advisory.

Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com>
2017-02-09 16:30:46 -08:00
Victor Vieux
ce29081d80 add 1.13.x CHANGELOG to master
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-09 15:11:06 -08:00
Victor Vieux
18adec5c89 print 'worker' join token after swarm init
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-09 14:54:05 -08:00
Brian Goff
7efc286518 Merge pull request #30146 from tonistiigi/update-net
vendor: update golang/net to c427ad74c
2017-02-09 12:41:08 -05:00
Brian Goff
10c0af0835 Merge pull request #30702 from allencloud/update-api-docs-about-filters
add missing filter type in swagger.yml and sort filter type in alphabets
2017-02-09 10:33:49 -05:00
Justin Cormack
cff32a411a Merge pull request #30849 from vieux/bump_api_1.27
bump engine API to 1.27
2017-02-09 13:48:43 +00:00
Harald Albers
33d9b58472 Fix bash completion for start --checkpoint
Signed-off-by: Harald Albers <github@albersweb.de>
2017-02-09 14:41:50 +01:00
Arnaud Porterie
f86283fc32 Merge pull request #30864 from icecrime/fix_poule_config
Fix poule configuration
2017-02-09 01:40:17 -08:00
Arnaud Porterie (icecrime)
3bf1922333
Fix poule configuration
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2017-02-09 01:37:53 -08:00
chchliang
fd74940304 add test case check connect.EndpointConfig not nil
Signed-off-by: chchliang <chen.chuanliang@zte.com.cn>
2017-02-09 11:26:20 +08:00
Zhang Wei
eb3a7c2329 Send "Name" and "ID" when stating stopped containers
When `docker stats` stopped containers, client will get empty stats data,
this commit will gurantee client always get "Name" and "ID" field, so
that it can format with `ID` and `Name` fields successfully.

Signed-off-by: Zhang Wei <zhangwei555@huawei.com>
2017-02-09 09:46:59 +08:00
Sebastiaan van Stijn
40dbbd3f9b Merge pull request #30804 from mstanleyjones/cli_fixups
Cli fixups
2017-02-08 17:07:43 -08:00
Misty Stanley-Jones
52df69f00d Standardized formatting of CLI reference commands
Command name should be a H1

Only Description, Examples, and Related Commands should be H2

Changed 'Related information' heading to 'Related commands' since 99% it is only linking commands

Added some examples where relevant

Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-02-08 16:57:58 -08:00
Misty Stanley-Jones
80ee21e533 Removed unused image
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-02-08 16:38:31 -08:00
Misty Stanley-Jones
e2ce870371 Add info about the relationship between swarm leave and node rm
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-02-08 16:38:31 -08:00
Iliana Weller
0b0216b67b
Build the docker-engine RPM for Amazon Linux
Signed-off-by: Iliana Weller <iweller@amazon.com>
2017-02-08 16:19:22 -08:00
Victor Vieux
6bad3fc9fb bump engine API to 1.27
Signed-off-by: Victor Vieux <victorvieux@gmail.com>
2017-02-08 16:14:58 -08:00
Sebastiaan van Stijn
dea528e8cd Merge pull request #29906 from allencloud/update-events-related-things
update events related doc and swagger.yml
2017-02-08 14:13:37 -08:00
Misty Stanley-Jones
1e74df3637 Define bridge networks
Signed-off-by: Misty Stanley-Jones <misty@docker.com>
2017-02-08 13:33:34 -08:00
Vincent Demeester
f19bfbbf8c Merge pull request #30835 from icecrime/update_poule
Randomly assigned pull requests after 2 weeks
2017-02-08 22:23:24 +01:00
Yong Tang
6fb3a9d33c Update SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2
This fix updates SwarmKit to ed384f3b3957f65e3111bd020f9815f3d4296fa2.
Notable changes since last update (3ca4775ba4a5519e2225c3337c7db8901ec39d26):

1. Fix duplicated ports allocation with restarted swarm. (Docker issue #29247)
2. Topology-aware scheduling (Docker PR #30725)

Docker issue #29247 was labeled 1.13.1, though it is advised that
related SwarmKit changes only to be merged to master
(based on the feedback https://github.com/docker/swarmkit/pull/1802#issuecomment-274143500)

This fix fixes #29247 (master only).
This fix is related to #30725.

Signed-off-by: Yong Tang <yong.tang.github@outlook.com>
2017-02-08 11:59:13 -08:00
Sebastiaan van Stijn
d4be5a2f67 Merge pull request #30802 from anusha-ragunathan/debug_docs
Add plugin debug docs.
2017-02-08 11:49:11 -08:00
Anusha Ragunathan
94c40a3074 Add plugin debug docs.
Doc fix for #30761

Signed-off-by: Anusha Ragunathan <anusha.ragunathan@docker.com>
2017-02-08 11:46:24 -08:00
Alexander Morozov
f5116c6802 Merge pull request #30776 from WeiZhang555/stats-all-format-name-panic-cli
Fix panic of "docker stats --format {{.Name}} --all"
2017-02-08 11:40:06 -08:00
Aaron Lehmann
846b787819 Merge pull request #30453 from yongtang/30242-duplicate-network-name-inspect
Return error in case `docker network inspect` is ambiguous
2017-02-08 09:18:31 -08:00
Arnaud Porterie (icecrime)
e27838049d
Fix typo
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com>
2017-02-08 07:58:46 -08:00
Arnaud Porterie (icecrime)
d4f5fa29db
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>
2017-02-08 07:58:32 -08:00
Brian Goff
98d34ae606 Merge pull request #30812 from allencloud/add-filters-for-plugin-list-in-swaggeryml
add filters for plugin list endpoint in swagger.yml
2017-02-08 10:35:21 -05:00
allencloud
5692a7ba3d remove 400 and 404 for get nodes endpoint and add 503 for secret update
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-08 23:06:09 +08:00
Vincent Demeester
db63f9370e
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>
2017-02-08 09:53:38 +01:00
Steve Durrheimer
7027cd5b37
Fix useless trailing backslash in zsh completion
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-08 08:11:20 +01:00
Steve Durrheimer
d41ceb9d73
Add cache invalidation in zsh completion when the DOCKER_HIDE_LEGACY_COMMANDS envvar changes
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-02-08 08:10:34 +01:00
allencloud
26649de086 add filters for plugin list endpoint in swagger.yml
Signed-off-by: allencloud <allen.sun@daocloud.io>
2017-02-08 14:07:20 +08:00
Zhang Wei
5a7b3c78e0 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>
2017-02-08 10:26:52 +08:00
Brian Goff
41650df87e Merge pull request #30474 from allencloud/sort-volume-drivers
sort volume drivers  and auth plugins in info response
2017-02-07 21:13:21 -05:00
Yong Tang
abf31ee083 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>
2017-02-07 18:05:29 -08:00
Akihiro Suda
31f172bdb5 Merge pull request #30790 from vdemeester/pr-30602
Carry #30602 : Bump go-units
2017-02-08 11:04:22 +09:00
Kenfe-Mickaël Laventure
1459dc573a Merge pull request #30642 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 #30694 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 #30661 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 #30638 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 #30640 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 #30457 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 #29552 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 #30780 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 #29563 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