c227e1300b
Vendor package update github.com/mattn/go-shellwords
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 3d6d9061e3df82bd1728de9873b872e2800c3b92
Component: engine
2017-04-11 18:14:00 +05:30
21d92ba641
Merge pull request #32511 from mkumatag/remove_mock_vendor
...
Remove unused github.com/golang/mock from vendor.conf
Upstream-commit: 8d53fb517280a5b7b60d875b2fe12b7332df531e
Component: engine
2017-04-11 17:54:35 +09:00
443e2161ff
Merge pull request #32495 from dnephin/cleanup-builder-dispatcher-env
...
Remove Builder.dockerfile field
Upstream-commit: b764c471bf1a648342a4b4f58de1e9768b49b4ed
Component: engine
2017-04-11 14:50:55 +09:00
f745194027
Remove unused github.com/golang/mock
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 30a16250027fd3794c5400031e8f447c5c360497
Component: engine
2017-04-11 10:20:16 +05:30
89e454a1d4
Merge pull request #31954 from darrenstahlmsft/GraphdriverReference
...
Windows: Fix reference counting in graphdriver
Upstream-commit: a6746e6ca5da6df6af9d93fc51149c35d58a55fd
Component: engine
2017-04-10 20:23:15 -07:00
0bf5e70579
Merge pull request #32496 from tonistiigi/build-target
...
builder: add an option for specifying build target
Upstream-commit: 18ae574cab9c4eb5183e419b1ca698dd76ed1194
Component: engine
2017-04-10 19:02:21 -07:00
108aa4253e
Merge pull request #32462 from dperny/service-logs-general-availability
...
Remove experimental from service logs
Upstream-commit: 17a3e4511d8f20868a051f10dbedabdce7ea2f9c
Component: engine
2017-04-10 18:30:20 -07:00
9c833700c4
Merge pull request #32092 from alfred-landrum/gdcaps
...
Let graphdrivers declare diff stream fidelity
Upstream-commit: 74093fe4ca259c5378da89098c48fb7b1167732e
Component: engine
2017-04-10 18:20:32 -07:00
6516b7e3d8
Merge pull request #32110 from adshmh/30977-stack-rm-should-accept-multiple-labels
...
stack rm should accept multiple arguments
Upstream-commit: 3a9572ca14c821ea0cf24dd590f608392e7a6ad1
Component: engine
2017-04-10 18:19:59 -07:00
72f89cba18
Windows: Fix reference counting in graphdriver
...
Signed-off-by: Darren Stahl <darst@microsoft.com >
Upstream-commit: 7fab9b8a6054270763508ce88cb06c584cfeb153
Component: engine
2017-04-10 17:13:17 -07:00
a89a2c21c5
builder: add an option for specifying build target
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 33e07f41adc0ec96edad5f22bc2cfaec0d26ea58
Component: engine
2017-04-10 16:21:43 -07:00
51259136c6
bump to rc2
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
(cherry picked from commit 2f35d73b7dc7a9e234ea06f6145a26c37472c775)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 3569dac3c01f8966375b564e01ce1c29f0dc1aa0
Component: engine
2017-04-11 00:58:34 +02:00
a22988a573
Merge pull request #31848 from thaJeztah/17.04.0-changelog-updates
...
[17.04.x] deprecation and changelog updates
(cherry picked from commit f15f5937514c386ace40a43441dddc28337ca12d)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 9c2f8febaff2d61a30828db57bdef0064fac8e91
Component: engine
2017-04-11 00:57:37 +02:00
d0562f46dc
Merge pull request #31811 from vieux/bump_17.04.0
...
bump 17.04.0-rc1
(cherry picked from commit b2fc918c5aa6d0c96953acaf62f9fb38049b608e)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: d55ec07acd31e1557e0076aa7280a33f891f503c
Component: engine
2017-04-11 00:57:19 +02:00
4eb0844e51
Remove the dockerfile field from Builder.
...
Return dockerfile from parseDockerfile and pass the dockerfile nodes
as an arg
Strip unused arg from builder.NewBuilder.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: f3e205ddc15040ec80ef047959afa7b75586a491
Component: engine
2017-04-10 18:09:17 -04:00
1abf6ed1ab
Merge pull request #32492 from icecrime/update_gitdm_domain-map
...
Update gitdm domain-map
Upstream-commit: 7da7fc3ad071b7ce90185fa4a2e2a8f085d89e2b
Component: engine
2017-04-10 14:54:12 -07:00
9a2b12ff7d
Update gitdm domain-map
...
Signed-off-by: Arnaud Porterie (icecrime) <arnaud.porterie@docker.com >
Upstream-commit: bfb6815f481c4112087f44fb6539019ec52d7c33
Component: engine
2017-04-10 14:28:27 -07:00
70dbb373c2
Merge pull request #32485 from albers/completion-node-ls--filter
...
Add bash completion for `node ls --format`
Upstream-commit: 5f7150059fdf04ff78d6108f22a9ca66bc3da969
Component: engine
2017-04-10 17:04:20 -04:00
bdda1a695e
Merge pull request #32116 from mkumatag/inspect_template
...
Adopt text/template in node inspect
Upstream-commit: ec207ce186bff1804f49c456f77fe7d377e63d30
Component: engine
2017-04-10 23:02:26 +02:00
24a0a6b6bb
Remove experimental from service logs
...
Service logs API is now stable. Service logs now support all features,
except retrieving details provided to the log driver.
Signed-off-by: Drew Erny <drew.erny@docker.com >
Upstream-commit: 306cfecc8c146ea8addb44dd35296808b25916a2
Component: engine
2017-04-10 13:40:45 -07:00
88f1fa957c
Merge pull request #32479 from aboch/vnd
...
Do not error out on serv bind deactivation if no sbox is found
Upstream-commit: 129d1f7051d77278bcc918b4fd2e848292d74f84
Component: engine
2017-04-10 22:16:04 +02:00
ef02a743db
Merge pull request #28403 from cpuguy83/logging_plugins
...
Implement plugins for logging drivers
Upstream-commit: 28334c1d829b9ea8ac7e10d45a6db37c3821d5db
Component: engine
2017-04-10 21:57:56 +02:00
4e6c66cece
Add bash completion for node ls --format
...
Signed-off-by: Harald Albers <github@albersweb.de >
Upstream-commit: ef77f002e7f6722b839f9afb02dd2dbfe0ff601b
Component: engine
2017-04-10 12:57:32 -07:00
65a5e8539f
Merge pull request #31877 from albers/completion-update--cpus
...
Add bash completion for `update --cpus`
Upstream-commit: 9b2ac77f645430609db951551dafd17307a2733f
Component: engine
2017-04-10 21:43:16 +02:00
15fc803536
Merge pull request #31236 from tonistiigi/docker-stdin
...
build: accept -f - to read Dockerfile from stdin
Upstream-commit: 778e32a2fadcf1ccb1819ad6534af5c477585300
Component: engine
2017-04-10 20:14:54 +02:00
e5dfac43c9
Merge pull request #31148 from yongtang/31032-NanoCPU-update
...
Add `--cpus` support for `docker update`
Upstream-commit: 5b1cae227171a299e41835a4806cd939b984c596
Component: engine
2017-04-10 20:02:15 +02:00
6d75b7a10d
Merge pull request #30740 from yongtang/29999-prune-filter-label
...
Add `label` filter for `docker system prune`
Upstream-commit: 4460312ce1a53316e3c474ab951b85e737a902c5
Component: engine
2017-04-10 19:38:01 +02:00
43f24a2541
Merge pull request #31352 from dnephin/allow-arg-in-fromt
...
[dockerfile] Allow ARG in FROM
Upstream-commit: 4d9e32a08e8e2613601cbc5d36bd8c7ecf32a772
Component: engine
2017-04-10 13:23:40 -04:00
276ea6a456
Implement plugins for logging drivers
...
Logging plugins use the same HTTP interface as other plugins for basic
command operations meanwhile actual logging operations are handled (on
Unix) via a fifo.
The plugin interface looks like so:
```go
type loggingPlugin interface {
StartLogging(fifoPath string, loggingContext Context) error
StopLogging(fifoPath)
```
This means a plugin must implement `LoggingDriver.StartLogging` and
`LoggingDriver.StopLogging` endpoints and be able to consume the passed
in fifo.
Logs are sent via stream encoder to the fifo encoded with protobuf.
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
Upstream-commit: 27bd6842f8518780b99fdb42f8e7f84c17856d87
Component: engine
2017-04-10 13:17:20 -04:00
e6a4499500
Merge pull request #32427 from adshmh/add-unit-tests-to-cli-command-idresolver-package
...
Added unit tests to the cli/command/idresolver package
Upstream-commit: a5b9d99b9e3db4d85cccd55d0f4c26c9fc37c498
Component: engine
2017-04-10 12:41:09 -04:00
bad834206e
Do not error out on serv bind deactivation if no sbox is found
...
- If the nw sbox is not there, then there is nothing to deactivate.
Signed-off-by: Alessandro Boch <aboch@docker.com >
Upstream-commit: 2418f257675807e5ae578137af48a2622797b746
Component: engine
2017-04-10 09:13:41 -07:00
f1d65fe958
Merge pull request #32450 from miaoyq/fixed-a-bug-of-multireader
...
Reset the positions for all readers of multireader before reading the data
Upstream-commit: 8fabe07982e04dd17e2e3cdcd0456bb782576d5e
Component: engine
2017-04-10 11:39:47 -04:00
a5328df4bd
Merge pull request #32084 from simonferquel/multi-stage-builds-windows
...
Multi stage builds cleanup for Windows
Upstream-commit: a48f4257f0af5259584b69ed32b1bd9152d0a74c
Component: engine
2017-04-10 17:36:36 +02:00
49adc43a40
Merge pull request #32285 from dmcgowan/revert-fix-for-flaky-misconfigured-token-test
...
Revert change to TestPushMisconfiguredTokenServiceResponseError
Upstream-commit: 61d3ddfe780b58b69b8af4f2bbb4312b7b0f71a1
Component: engine
2017-04-10 16:34:58 +02:00
b73616e986
Merge pull request #32469 from darkowlzz/32314-fix-default-init-binary-value
...
Fix missing Init Binary in docker info output
Upstream-commit: d291888047fedcabbcc453b21049d217294fa5f3
Component: engine
2017-04-10 09:55:23 -04:00
f8815ca306
Added word to documentation
...
Improved documentation by adding word for better sentence structure.
Signed-off-by: Mike Casas <mkcsas0@gmail.com >
Upstream-commit: eb6a3e8361dc48037ff3e29f5802bd21782cb645
Component: engine
2017-04-10 09:14:01 -04:00
b91fdec82e
Merge pull request #32362 from tonistiigi/multi-stage-build-docs
...
Add docs for multi-stage builds
Upstream-commit: 2ba9783d1a50a519a42e69dbfa7b3b0755938a25
Component: engine
2017-04-10 14:26:08 +02:00
708ad46cdf
Adopt text/template in node inspect
...
Signed-off-by: Manjunath A Kumatagi <mkumatag@in.ibm.com >
Upstream-commit: 5dbd6afb5144a937df73bfe42364e583e789d80d
Component: engine
2017-04-10 17:47:15 +05:30
3d6e7463ee
Fix missing Init Binary in docker info output
...
- Moved DefaultInitBinary from daemon/daemon.go to
daemon/config/config.go since it's a daemon config and is referred in
config package files.
- Added condition in GetInitPath to check for any explicitly configured
DefaultInitBinary. If not, the default value of DefaultInitBinary is
returned.
- Changed all references of DefaultInitBinary to refer to the variable
from new location.
- Added TestCommonUnixGetInitPath to test for the various values of
GetInitPath.
Fixes #32314
Signed-off-by: Sunny Gogoi <indiasuny000@gmail.com >
Upstream-commit: 17b128876028022991e2dbcb2cc402cc81b451e5
Component: engine
2017-04-10 16:54:07 +05:30
73fce35ed0
Merge pull request #32062 from aaronlehmann/change-network-attachments
...
Support service network attachment changes
Upstream-commit: b0831acb09662431ecfed84677e7f5ed54635d52
Component: engine
2017-04-10 12:49:28 +02:00
04adcf44c3
Merge pull request #31364 from adshmh/30935-use-encrypted-client-certificate-to-connect-to-a-docker-host
...
use an encrypted client certificate to connect to a docker daemon
Upstream-commit: 2daa2b894c1cf62936fe55dc8782c486aafaecdd
Component: engine
2017-04-10 10:42:01 +02:00
88cdacca6c
Add docs for named build stages
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 877ac98e44f2b1d9af6319ca07d232a3cd929d39
Component: engine
2017-04-09 20:40:50 -07:00
f4a661bcfe
Merge pull request #32447 from aboch/vnd
...
Fix container no ipv6 when run container on --network=host
Upstream-commit: 9f27f0dcd3b8953a53f20e3f29f493d876b56941
Component: engine
2017-04-09 15:07:58 -07:00
062fe4952a
Merge pull request #32055 from FabianLauer/so-counters
...
Update stackoverflow question count
Upstream-commit: 9585d0ea19859c5f145bc763d474190447b91c7b
Component: engine
2017-04-09 23:05:09 +02:00
e8ce53d1e2
Update stackoverflow.com install counters
...
There's ~27k questions by now, not just 7k 😉
Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de >
README.md & CONTRIBTUTING.md: Use word `thousand` instead of numbers
27000 -> 27 thousand
Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de >
README+CONTRIB: No specific number of SO questions
Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de >
CONTRIBUTING.md: Remove unnecessary word
Signed-off-by: Fabian Lauer <kontakt@softwareschmiede-saar.de >
Upstream-commit: 012e5c2d1b99899c27a9d673b5d22b83db05f5c8
Component: engine
2017-04-09 09:19:06 +02:00
c7be93cd96
Merge pull request #32436 from thaJeztah/refactor-tiny-version-parsing
...
Refactor tiny version parsing
Upstream-commit: 51aa2a226e21e20c5b4634a28245c760f4e18f37
Component: engine
2017-04-08 17:36:40 +02:00
82daf40462
Merge pull request #32448 from aaronlehmann/vendor-swarmkit-d5232280
...
Vendor swarmkit d5232280
Upstream-commit: 46c9df652d26a806945a9ae841dfc499ead6bf17
Component: engine
2017-04-08 09:42:52 -04:00
36c4c39157
Refactor "init" version parsing, and add unit-test
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 72eddf4258db8c10b145ded188d13c50e4a5530b
Component: engine
2017-04-08 11:28:37 +02:00
aebc58bf87
Reset the position of all readers before reading the data
...
Signed-off-by: Yanqiang Miao <miao.yanqiang@zte.com.cn >
Upstream-commit: fd06bd6f96f1be5c14f30314b9c8c323b19219ed
Component: engine
2017-04-08 13:38:15 +08:00
df8ed895e4
Added unit tests to the cli/command/idresolver package
...
Signed-off-by: Arash Deshmeh <adeshmeh@ca.ibm.com >
Upstream-commit: 32486385e6ae67763f507373c8ca737d2d87669b
Component: engine
2017-04-07 23:23:39 -04:00
