Vincent Demeester
c38d4936f4
Merge pull request #682 from albers/completion-service-options
...
Fix and simplify bash completion for service env, mounts and labels
Upstream-commit: 26a2a45967
Component: cli
2018-02-01 14:02:51 -08:00
Vincent Demeester
be8b7a4dfb
Merge pull request #851 from mistyhacks/overlay-network-limits
...
Doc guidance to only use 256 IPs per overlay
Upstream-commit: 19e4389a72
Component: cli
2018-02-01 11:11:27 -08:00
GordonTheTurtle
62c3cc507d
Merge component 'engine' from git@github.com:moby/moby master
2018-02-01 17:06:44 +00:00
GordonTheTurtle
6fbbcc8257
Merge component 'cli' from git@github.com:docker/cli master
2018-02-01 16:41:16 +00:00
Yong Tang
02e1927cf7
Remove integration-cli/docker_api_resize_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: e8d1f35718b3a9869778611b2cb11c2f4407350f
Component: engine
2018-02-01 16:37:01 +00:00
Sebastiaan van Stijn
d25b4a3533
Merge pull request #859 from mistyhacks/quotes-around-format-strings
...
Add quotes around format template
Upstream-commit: 5bf0d76494
Component: cli
2018-01-31 21:40:08 -08:00
Misty Stanley-Jones
20111ede63
Explain the columns shown in docker stats
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0219338781
Component: cli
2018-01-31 17:05:54 -08:00
Misty Stanley-Jones
2daf468e57
Add quotes around format template
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 0b6aeae007
Component: cli
2018-01-31 16:51:43 -08:00
Tibor Vass
4e10e192e9
Merge pull request #36160 from kolyshkin/layer-not-retained
...
daemon.cleanupContainer: nullify container RWLayer upon release
Upstream-commit: 53a58da551e961b3710bbbdfabbc162c3f5f30f6
Component: engine
2018-01-31 15:13:00 -08:00
Vincent Demeester
096bbe0b3e
Merge pull request #36166 from yongtang/01312018-TestAPIUpdateContainer
...
Migrate TestAPIUpdateContainer from integration-cli to api tests
Upstream-commit: 5772c4b8a25dfad869ecd83bb986e2b0d08b7a07
Component: engine
2018-01-31 15:02:00 -08:00
Vincent Demeester
d30180eaf5
Merge pull request #857 from mistyhacks/5759_typo-in-builder
...
Fix doubled word in note
Upstream-commit: 3aac740478
Component: cli
2018-01-31 14:51:37 -08:00
Misty Stanley-Jones
dc47308ffd
Add an example for --with-registry-auth
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 821452629c
Component: cli
2018-01-31 13:38:49 -08:00
Misty Stanley-Jones
0a7bda1a7c
Fix doubled word in note
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: a2bb62683d
Component: cli
2018-01-31 13:05:58 -08:00
Yong Tang
2fdf0e5bd3
Migrate TestAPIUpdateContainer from integration-cli to api tests
...
This fix migrates TestAPIUpdateContainer from integration-cli to api tests
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 490edd35829a7dd1144da50105fc377d41a52fc0
Component: engine
2018-01-31 20:02:55 +00:00
Daniel Nephin
e0f0ab1bd4
Merge pull request #36150 from yongtang/36139-ContainerStatus
...
Fix issue of ExitCode and PID not show up in Task.Status.ContainerStatus
Upstream-commit: 231a4408f2d691838e4f821eedb7439c4e1b3f56
Component: engine
2018-01-31 11:59:53 -08:00
Daniel Nephin
6bed3b4c11
Merge pull request #853 from thaJeztah/bump-go-connections
...
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
Upstream-commit: 3988d9cfd9
Component: cli
2018-01-31 10:22:41 -08:00
Daniel Nephin
275df9bb2d
Merge pull request #852 from thaJeztah/bump-version-18.03
...
Bump VERSION to 18.03.0-dev
Upstream-commit: 4a03f2a4ae
Component: cli
2018-01-31 10:21:54 -08:00
Yong Tang
5aed35b37a
Merge pull request #36163 from thaJeztah/bump-go-connections
...
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
Upstream-commit: e1f98e8ab3cb5ae5c0f452cdd81ac4a954279e62
Component: engine
2018-01-31 09:20:10 -08:00
GordonTheTurtle
0cabc3863b
Merge component 'engine' from git@github.com:moby/moby master
2018-01-31 17:04:47 +00:00
GordonTheTurtle
eba76967d1
Merge component 'cli' from git@github.com:docker/cli master
2018-01-31 16:41:13 +00:00
Yong Tang
6f8c4ca576
Remove docker_api_update_unix_test.go
...
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 8786b09c81e4eed540924ef415ecdfb5f9affa01
Component: engine
2018-01-31 16:10:34 +00:00
Yong Tang
877ec711a0
Fix issue of ExitCode and PID not show up in Task.Status.ContainerStatus
...
This fix tries to address the issue raised in 36139 where
ExitCode and PID does not show up in Task.Status.ContainerStatus
The issue was caused by `json:",omitempty"` in PID and ExitCode
which interprate 0 as null.
This is confusion as ExitCode 0 does have a meaning.
This fix removes `json:",omitempty"` in ExitCode and PID,
but changes ContainerStatus to pointer so that ContainerStatus
does not show up at all if no content. If ContainerStatus
does have a content, then ExitCode and PID will show up (even if
they are 0).
This fix fixes 36139.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: 9247e09944a4c7f3c2f3f20f180c047a19fb6bae
Component: engine
2018-01-31 15:35:19 +00:00
Sebastiaan van Stijn
e5e113b93d
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: b7a9f027f3
Component: cli
2018-01-31 01:38:06 -08:00
Sebastiaan van Stijn
aef7840d1c
Bump VERSION to 18.03.0-dev
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: beb0d08e48
Component: cli
2018-01-31 01:34:51 -08:00
Sebastiaan van Stijn
6744cda526
bump docker/go-connections to 98e7d807e5d804e4e42a98d74d1dd695321224ef
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: a6d35a822eed940260c74e2e7eea6455953ffabe
Component: engine
2018-01-31 01:30:56 -08:00
Akihiro Suda
a0d42db1d4
Merge pull request #36156 from r2d4/move-shell-parser
...
Move dockerfile ENV shell parser functions into subpackage
Upstream-commit: 421664aba1753b4f9475d6f42b8d18f65950d5ab
Component: engine
2018-01-31 14:48:01 +09:00
Kir Kolyshkin
d59bd66e1b
daemon.cleanupContainer: nullify container RWLayer upon release
...
ReleaseRWLayer can and should only be called once (unless it returns
an error), but might be called twice in case of a failure from
`system.EnsureRemoveAll(container.Root)`. This results in the
following error:
> Error response from daemon: driver "XXX" failed to remove root filesystem for YYY: layer not retained
The obvious fix is to set container.RWLayer to nil as soon as
ReleaseRWLayer() succeeds.
Signed-off-by: Kir Kolyshkin <kolyshkin@gmail.com >
Upstream-commit: e9b9e4ace294230c6b8eb010eda564a2541c4564
Component: engine
2018-01-30 18:50:59 -08:00
Matt Rickard
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
Misty Stanley-Jones
198448e674
Doc guidance to only use 256 IPs per overlay
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 6085b5d3aa
Component: cli
2018-01-30 15:41:53 -08:00
Vincent Demeester
2cc4e9e5e9
Add e2e container kill test
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 42edad2fc7
Component: cli
2018-01-30 15:38:45 -08:00
Sebastiaan van Stijn
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
Sebastiaan van Stijn
7de8b77c33
Merge pull request #848 from mistyhacks/fix-publish-table
...
Fix the network option table
Upstream-commit: bb9e5ab767
Component: cli
2018-01-30 14:32:32 -08:00
Misty Stanley-Jones
d0e1c8724c
Fix the network option table
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: 773ccdec7b
Component: cli
2018-01-30 14:00:48 -08:00
Sebastiaan van Stijn
30a8f2b39f
Merge pull request #849 from mistyhacks/add-filter-label-example
...
Add examples of prune by label
Upstream-commit: 0aabbb09b6
Component: cli
2018-01-30 13:52:34 -08:00
Yong Tang
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
Yong Tang
3c2369ae51
Merge pull request #36152 from yongtang/01302018-TestAuthAPI
...
Migrate TestAuthAPI from integration-cli to integration
Upstream-commit: 11ccbeb5c5ceeeaf6a57b766efe7e4701a740f56
Component: engine
2018-01-30 13:37:56 -08:00
Misty Stanley-Jones
b0db1afb21
Add examples of prune by label
...
Signed-off-by: Misty Stanley-Jones <misty@docker.com >
Upstream-commit: bc28bf13f7
Component: cli
2018-01-30 11:29:45 -08:00
Yong Tang
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
Yong Tang
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
GordonTheTurtle
6c2db26f29
Merge component 'engine' from git@github.com:moby/moby master
2018-01-30 17:05:43 +00:00
Yong Tang
fe18510901
Add REMOVE and ORPHANED to TaskState
...
This fix tries to address the issue raised in 36142 where
there are discrepancies between Swarm API and swagger.yaml.
This fix adds two recently added state `REMOVE` and `ORPHANED` to TaskState.
This fix fixes 36142.
Signed-off-by: Yong Tang <yong.tang.github@outlook.com >
Upstream-commit: a40687f5ac7df27bc6c6c3a6f69513a397a1a05a
Component: engine
2018-01-30 16:46:05 +00:00
GordonTheTurtle
c1528c1357
Merge component 'cli' from git@github.com:docker/cli master
2018-01-30 16:41:38 +00:00
Sebastiaan van Stijn
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
Yong Tang
8c6b3bb86c
Merge pull request #36141 from yongtang/01292018-stop_test
...
Migrate docker_cli_stop_test.go to api test
Upstream-commit: d98cdc490cca30b4928ad82668485111f9b800df
Component: engine
2018-01-29 19:31:01 -08:00
Sebastiaan van Stijn
db1ce9af6b
Merge pull request #838 from vdemeester/fix-label-file-behavior
...
Fix `--label-file` weird behavior
Upstream-commit: 9de1b162fa
Component: cli
2018-01-29 17:32:21 -08:00
Vincent Demeester
4d611b9990
Add support for multiple composefile when deploying
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: 1872bd802c
Component: cli
2018-01-29 17:27:25 -08:00
Yong Tang
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
Daniel Nephin
f6b5291c4c
Merge pull request #844 from tophj-ibm/bump-to-go-1-9-3
...
Bump Go to 1.9.3 (cont.)
Upstream-commit: 7da324a2f6
Component: cli
2018-01-29 16:17:28 -05:00
Yong Tang
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
Vincent Demeester
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
Component: cli
2018-01-29 11:08:54 -08:00