6fbbcc8257
Merge component 'cli' from git@github.com:docker/cli master
2018-02-01 16:41:16 +00:00
2daf468e57
Add quotes around format template
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0b6aeae007
2018-01-31 16:51:43 -08:00
0a7bda1a7c
Fix doubled word in note
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2bb62683d
2018-01-31 13:05:58 -08:00
6bed3b4c11
Merge pull request #853 from thaJeztah/bump-go-connections
...
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
Upstream-commit: 3988d9cfd9
2018-01-31 10:22:41 -08:00
0cabc3863b
Merge component 'engine' from git@github.com:moby/moby master
2018-01-31 17:04:47 +00:00
eba76967d1
Merge component 'cli' from git@github.com:docker/cli master
2018-01-31 16:41:13 +00:00
e5e113b93d
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b7a9f027f3
2018-01-31 01:38:06 -08:00
aef7840d1c
Bump VERSION to 18.03.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: beb0d08e48
2018-01-31 01:34:51 -08:00
3ea1f0df2c
Move builder shell parser into subpackage
...
Moves builder/shell_parser and into its own subpackage at builder/shell since it
has no dependencies other than the standard library. This will make it
much easier to vendor for downstream libraries, without pulling all the
dependencies of builder/.
Fixes #36154
Signed-off-by: Matt Rickard <mrick@google.com >
Upstream-commit: a634526d14639c6b98c509a069ef29e2b69c0ef0
Component: engine
2018-01-30 17:54:39 -08:00
090ffb4eb7
Merge pull request #36125 from thaJeztah/fix-plural-singular-node-generic-resources
...
Fix "--node-generic-resource" singular/plural
Upstream-commit: a80cd04eb5375f0eb7b648e820f694b45983cf2b
Component: engine
2018-01-30 14:38:50 -08:00
7de8b77c33
Merge pull request #848 from mistyhacks/fix-publish-table
...
Fix the network option table
Upstream-commit: bb9e5ab767
2018-01-30 14:32:32 -08:00
d0e1c8724c
Fix the network option table
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 773ccdec7b
2018-01-30 14:00:48 -08:00
835d51fadd
Merge pull request #36148 from yongtang/01302018-TestLinksEtcHostsContentMatch
...
Migrate some integration-cli test to api tests
Upstream-commit: 5e7a245c3f63a29fb0eb96d8897238b9dd3cfc47
Component: engine
2018-01-30 13:38:15 -08:00
b0db1afb21
Add examples of prune by label
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: bc28bf13f7
2018-01-30 11:29:45 -08:00
bbb554bc58
Migrate TestAuthAPI from integration-cli to integration
...
This fix migrates TestAuthAPI from integration-cli to integration
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: d9247557898d1d15a7349ecb0044b73d4a5a41a9
Component: engine
2018-01-30 19:15:06 +00:00
6d89c35e6e
Migrate some integration-cli test to api tests
...
This fix migrate TestLinksEtcHostsContentMatch
to api test.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e6bd20edcbf3b7a6f87a356ab0943714936c70e1
Component: engine
2018-01-30 18:52:48 +00:00
6c2db26f29
Merge component 'engine' from git@github.com:moby/moby master
2018-01-30 17:05:43 +00:00
c1528c1357
Merge component 'cli' from git@github.com:docker/cli master
2018-01-30 16:41:38 +00:00
f0d03ada35
Merge pull request #35946 from joelwurtz/patch-2
...
Fix Volumes property definition in ContainerConfig
Upstream-commit: 40a9d5d24cda0d938f3c41dceef41b97b6b4e847
Component: engine
2018-01-29 20:57:09 -08:00
db1ce9af6b
Merge pull request #838 from vdemeester/fix-label-file-behavior
...
Fix `--label-file` weird behavior
Upstream-commit: 9de1b162fa
2018-01-29 17:32:21 -08:00
12f9c4b018
Migrate docker_cli_stop_test.go to api test
...
This fix migrate docker_cli_stop_test.go to api test
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 4f378124ff649b844de88c93f6ca70e6b3f5d7d7
Component: engine
2018-01-30 00:55:18 +00:00
98a8916ad3
Merge pull request #36124 from crosbymichael/exec
...
Use proc/exe for reexec
Upstream-commit: 9d61e5c8c1d85f633643a8b9071393dc417d56dd
Component: engine
2018-01-29 11:41:08 -08:00
aea7a7fc73
Fix --label-file weird behavior
...
`--label-file` has the exact same behavior as `--env-file`, meaning any
placeholder (i.e. a simple key, no `=` sign, no value), it will get the
value from the environment variable.
For `--label-file` it should just add an empty label.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 2b17f4c8a8
2018-01-29 11:08:54 -08:00
27ced4316d
Merge pull request #36131 from yongtang/01282018-swarmkit
...
Update swarmkit to 68a376dc30d8c4001767c39456b990dbd821371b
Upstream-commit: 9c5686fbd04cced838c601a4bf9583bd4b8b9700
Component: engine
2018-01-29 11:07:13 -08:00
33c438d7c6
Bump Go to 1.9.3
...
Signed-off-by: Christopher Jones <tophj@linux.vnet.ibm.com >
Upstream-commit: d89f5fa731
2018-01-29 13:43:59 -05:00
9bff0e7832
Merge pull request #36130 from yongtang/36042-secret-config-mode
...
Fix secret and config mode issue
Upstream-commit: d093aa0ec365e1ffd4db8a513c5b341b9a0d012e
Component: engine
2018-01-29 10:37:24 -08:00
6c313c03fe
Merge pull request #36114 from Microsoft/jjh/fixdeadlock-lcowdriver-hotremove
...
LCOW: Graphdriver fix deadlock in hotRemoveVHDs
Upstream-commit: 03a1df95369ddead968e48697038904c84578d00
Component: engine
2018-01-29 09:57:43 -08:00
691eb859f4
Merge component 'engine' from git@github.com:moby/moby master
2018-01-29 17:04:44 +00:00
13e5898067
Merge pull request #34369 from cyphar/build-buildmode-pie
...
*: switch to -buildmode=pie
Upstream-commit: cd3c0057ac28b5601196424597d7fed226948386
Component: engine
2018-01-29 23:54:03 +09:00
a94b27c618
Merge pull request #36132 from yongtang/01282018-typo
...
Fix a typo in CONTRIBUTING.md
Upstream-commit: 4219df22fc138bc9d180ef81ab2838bb85d96ace
Component: engine
2018-01-28 12:21:46 -08:00
a1a0300f4c
Merge component 'engine' from git@github.com:moby/moby master
2018-01-28 17:04:35 +00:00
b13e2a39e1
Add test cases for file mode with secret and config.
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 65ee7fff02111bf696bc2fec442d07c2957f4151
Component: engine
2018-01-28 16:48:10 +00:00
eac1cd59fb
Merge component 'cli' from git@github.com:docker/cli master
2018-01-28 16:41:09 +00:00
7b9944fc04
Merge pull request #36074 from shutefan/master
...
Update API docs to show that /containers/{id}/kill returns HTTP 409
Upstream-commit: 958200970f4c52fd093aa913632d2d2b79ebf969
Component: engine
2018-01-28 08:32:35 -08:00
82bc59e5d6
Fix secret and config mode issue
...
This fix tries to address the issue raised in 36042
where secret and config are not configured with the
specified file mode.
This fix update the file mode so that it is not impacted
with umask.
Additional tests have been added.
This fix fixes 36042.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 3305221eefd18ba7712a308c1fb05d4eeeac2cc6
Component: engine
2018-01-28 16:21:41 +00:00
9d28e686ee
Update swarmkit to 68a376dc30d8c4001767c39456b990dbd821371b
...
This fix updates swarmkit to 68a376dc30d8c4001767c39456b990dbd821371b:
```
-github.com/docker/swarmkit 713d79dc8799b33465c58ed120b870c52eb5eb4f
+github.com/docker/swarmkit 68a376dc30d8c4001767c39456b990dbd821371b
```
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: b9923d853076c4ce884246dc3e17955dcf851f16
Component: engine
2018-01-28 16:20:17 +00:00
9a7da567a7
Fix a typo in CONTRIBUTING.md
...
`seperate` -> `separate`
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: cce360c7b0136f91fdce6e15ec7fb83eb14153f2
Component: engine
2018-01-28 16:19:51 +00:00
b24e274bbe
Merge pull request #36099 from thaJeztah/bump-libnetwork3
...
bump libnetwork to 5ab4ab830062fe8a30a44b75b0bda6b1f4f166a4
Upstream-commit: 9368e9dac3e7202d2b15a83427010db7b062033a
Component: engine
2018-01-27 21:47:29 -08:00
5e3cb1566c
Merge pull request #34992 from allencloud/simplify-shutdowntimeout
...
simplify codes on calculating shutdown timeout
Upstream-commit: c9f1807abbc60236f5552f8dd25e6d484584f037
Component: engine
2018-01-27 18:26:54 -08:00
8f3ae07b6b
Merge pull request #717 from albers/completion-images-2
...
Improve and fix bash completion for images
Upstream-commit: 4586609f71
2018-01-27 17:48:49 -08:00
8d2c67f10d
Merge pull request #36095 from yongtang/36083-network-inspect-created-time
...
Fix issue where network inspect does not show Created time for networks in swarm scope
Upstream-commit: 924fb0e843930ca444e0f3a6632d7cb67a3da479
Component: engine
2018-01-26 17:18:30 -08:00
3d79cf83bd
Merge pull request #35911 from ASMfreaK/Russian-Scientsists-addition-to-names-generator
...
Add more russian scientists in names-generator.go
Upstream-commit: c41c80026b1469d398edee0167ef33653ff82e93
Component: engine
2018-01-26 15:48:58 -08:00
7c5df03153
Fix "--node-generic-resource" singular/plural
...
Daemon flags that can be specified multiple times use
singlar names for flags, but plural names for the configuration
file.
To make the daemon configuration know how to correlate
the flag with the corresponding configuration option,
`opt.NewNamedListOptsRef()` should be used instead of
`opt.NewListOptsRef()`.
Commit 6702ac590e6148cb3f606388dde93a011cb14931 attempted
to fix the daemon not corresponding the flag with the configuration
file option, but did so by changing the name of the flag
to plural.
This patch reverts that change, and uses `opt.NewNamedListOptsRef()`
instead.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: 6e7715d65ba892a47d355e16bf9ad87fb537a2d0
Component: engine
2018-01-26 13:53:13 -08:00
37f71b34b7
Merge pull request #804 from thaJeztah/more-annotations
...
Annotate "stack" commands to be "swarm" and "kubernetes"
Upstream-commit: a46fa0759d
2018-01-26 15:12:09 -05:00
dce32bffba
Use proc/exe for reexec
...
You don't need to resolve the symlink for the exec as long as the
process is to keep running during execution.
Signed-off-by: Michael Crosby <crosbymichael@gmail.com >
Upstream-commit: 59ec65cd8cec942cee6cbf2b8327ec57eb5078f0
Component: engine
2018-01-26 14:13:43 -05:00
db2a10168c
Merge pull request #36047 from cpuguy83/graphdriver_improvements
...
Do not make graphdriver homes private mounts.
Upstream-commit: 2c05aefc99d33edde47b08e38978b6c2f4178648
Component: engine
2018-01-26 13:54:30 -05:00
5338e07ad9
Merge pull request #829 from thaJeztah/bump-moby
...
Bump moby and dependencies
Upstream-commit: 44e93ddd13
2018-01-26 10:42:14 -08:00
4e8a0d189e
Simplify codes on calculating shutdown timeout
...
Signed-off-by: Allen Sun <shlallen1990@gmail.com >
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: de68ac8393d32d2c2028dd11c5816430ad0d8d8b
Component: engine
2018-01-26 09:18:07 -08:00
62e8f8e9af
Merge component 'engine' from git@github.com:moby/moby master
2018-01-26 17:03:45 +00:00
a002f8068e
LCOW: Graphdriver fix deadlock
...
Signed-off-by: John Howard <jhoward@microsoft.com >
Upstream-commit: a44fcd3d27c06aaa60d8d1cbce169f0d982e74b1
Component: engine
2018-01-26 08:57:52 -08:00
