2c87cf80c3
Cleanup compose convert error messages.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: b03a18572363560845439eec041502014da85128
Component: engine
2017-03-24 10:43:28 -04:00
d952883696
Merge pull request #32042 from vdemeester/compose-interpolate-error-instead-of-panic
...
[compose/interpolation] Make sure we error out instead of panic during interpolation
Upstream-commit: 8d2a82853c3401bdffbcc91b12399ef6589d26d0
Component: engine
2017-03-24 09:00:06 +01:00
e1610cddb8
Merge pull request #31986 from Microsoft/jjh/fix28267
...
Windows: Don't close client stdin handle to avoid hang
Upstream-commit: ad530ffee09a4ca6b87a2b009f86b4651653e29a
Component: engine
2017-03-23 16:35:54 +01:00
229e8f9746
Make sure we error out instead of panic during interpolation
...
Use type assertion to error out if the type isn't the right one
instead of panic as before this change.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: c165a8bfa1419724eb504f3cb7fdf3ca1b97483b
Component: engine
2017-03-23 16:09:57 +01:00
0e04cd7ace
Merge pull request #32002 from vdemeester/compose-remove-type-dict
...
Remove compose types.Dict alias
Upstream-commit: bb1ae453a6f8b8bc1c5d03972d3223e6d9f70c40
Component: engine
2017-03-22 23:08:09 +01:00
f3536ca0df
Remove compose types.Dict alias
...
It is just an alias type and make the code a little bit more complex
and hard to use from outside `compose` package.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: d3dc27d145a36b3c81fd5999f2c525af95d9596a
Component: engine
2017-03-22 16:16:20 +01:00
b53e61fcff
Return proper exit code on builder panic
...
Signed-off-by: Tonis Tiigi <tonistiigi@gmail.com >
Upstream-commit: 385f1174ff6905243c51d97d641d815a520229ff
Component: engine
2017-03-21 19:09:23 -07:00
8df09e0187
Windows: Don't close client stdin handle to avoid hang
...
Signed-off-by: John Howard (VM) <jhoward@microsoft.com >
Upstream-commit: 91e971c0feeb507fdf728db1c10bd7c5e328e007
Component: engine
2017-03-21 16:00:17 -07:00
392ffd1e6e
Merge pull request #31705 from cyli/bump-go-connections
...
Use either a system pool or custom CA pool when connecting from client->daemon (+go-connections version bump)
Upstream-commit: afe1c5c2ebbe2d5448668761f722b0f5d2def9a5
Component: engine
2017-03-21 10:36:41 -07:00
bd926fecd3
Merge pull request #31621 from dnephin/cleanup-container-run-command
...
Some cleanup of container run command
Upstream-commit: f965aab5e95b52a5c44f4b4412bb0202adcf3174
Component: engine
2017-03-21 16:01:11 +01:00
730ccc302a
Merge pull request #31552 from ripcurld0/add_format_secretls
...
Add format to secret ls
Upstream-commit: 1ec77baed9f87c9c7cb64ddd2ad203d800ba7efa
Component: engine
2017-03-20 20:20:45 +01:00
f75a21c954
Merge pull request #31948 from vdemeester/compose-typo
...
Fixing a small typo in compose loader package
Upstream-commit: 550b06ab6a9e9e0200b9b5d2f5cb5b7b7b4bb16a
Component: engine
2017-03-20 17:48:50 +01:00
8e8d5b8f70
Fixing a small typo in compose loader package
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Upstream-commit: b8c45c3a570ad96ca59763361f6902ac694336d9
Component: engine
2017-03-20 15:39:57 +01:00
3e18c0a07b
fixed:go vetting warning unkeyed fields
...
Signed-off-by: Aaron.L.Xu <liker.xu@foxmail.com >
Upstream-commit: 2333b39b37cb7db80c66269d48c6f22dabf8973c
Component: engine
2017-03-20 16:30:01 +08:00
6d6cf437f8
Add format to secret ls
...
Signed-off-by: Boaz Shuster <ripcurld.github@gmail.com >
Upstream-commit: e281fe9c3a0034e119e7718a142133e86f38a4f2
Component: engine
2017-03-19 09:22:30 +02:00
bddb190597
Merge pull request #30781 from AkihiroSuda/fix-stack-env
...
compose: fix environment interpolation from the client
Upstream-commit: 8bc703804de45bafe4e6362d150d6c74db8dd7db
Component: engine
2017-03-17 15:56:50 +01:00
95c8df3265
compose: update the comment about MappingWithEquals
...
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: 2cdc9c42eb138bcaffb1cbd4172bd18b69446394
Component: engine
2017-03-17 06:21:55 +00:00
bdbc2fdcab
Merge pull request #31896 from aaronlehmann/move-secretrequestoption
...
api: Remove SecretRequestOption type
Upstream-commit: d376b18caf3c9e2f3535399b450dc25004be1ecc
Component: engine
2017-03-16 21:31:15 +01:00
8cf1672494
Merge pull request #31886 from daniel48/master
...
fix a typo
Upstream-commit: f5c57d88a4bc62a45cd76dc1648c522ff6c75599
Component: engine
2017-03-16 21:30:22 +01:00
f84a712c49
Merge pull request #31894 from dnephin/fix-schema-id
...
Fix compose schema id for v3.2
Upstream-commit: 3eaeee07c3e472e610a1dabf8d16558451307e38
Component: engine
2017-03-16 21:19:59 +01:00
8203424840
api: Remove SecretRequestOption type
...
This type is only used by CLI code. It duplicates SecretReference in the
types/swarm package. Change the CLI code to use that type instead.
Signed-off-by: Aaron Lehmann <aaron.lehmann@docker.com >
Upstream-commit: e7c39f4d5d761f68e6ac432934d8c3910e452855
Component: engine
2017-03-16 11:20:31 -07:00
6bac6aa413
Fix compose schema id for v3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 576d2181e453dbbf75254aa11bc90c1a86a1384f
Component: engine
2017-03-16 13:53:58 -04:00
77ff3cda60
fix a typo
...
when i was using:
docker search --automated -s 3 nginx
told me:
Flag --automated has been deprecated, use --filter=automated=true instead
Flag --stars has been deprecated, use --filter=stars=3 instead
and when i use:
docker search --filter=automated=true --filter=stars=3 nginx
told me:
Error response from daemon: Invalid filter 'automated'
and i found out that the correct command should be:
docker search --filter=is-automated=true --filter=stars=3 nginx
Signed-off-by: Pure White <daniel48@126.com >
Upstream-commit: 1d61f11e34ba6f1efdfd29a03d92181586bdcb93
Component: engine
2017-03-16 23:11:57 +08:00
943990f090
Add missing API version annotations to commands
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
Upstream-commit: e638089622af0448ee0d5d95c45575b63338c938
Component: engine
2017-03-16 13:40:12 +01:00
7a360dfa15
Merge pull request #31775 from erxian/misleading-default-for-update-monitor-duration-flag
...
misleading default for --update-monitor duration
Upstream-commit: 52143aee95f9464c73bf1bc31f9d8274e5922cd4
Component: engine
2017-03-16 10:13:26 +01:00
4298695e1f
Merge pull request #31866 from gdevillele/pr_service_create
...
improve semantics of utility function in cli/command/service
Upstream-commit: 8316753f96c84a904ae7a43416bd5d7944bfbc6f
Component: engine
2017-03-16 10:12:15 +01:00
8e50d3fcf9
Merge pull request #31057 from krasi-georgiev/30779-fix-client-login-credentials-save-domain
...
fix incorect login client credential save when the registry is the default docker registry
Upstream-commit: 87c5f67cfa1b9322946c4c9bfbf3dfd559d57b54
Component: engine
2017-03-16 13:19:32 +09:00
9a2da87e18
improve semantics of utility function in cli/command/service
...
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com >
Upstream-commit: 1526a99672a707727d9d903cc67c1e3b7150fda2
Component: engine
2017-03-15 13:49:52 -07:00
07acd5ad44
Revert "Planned 1.13 deprecation: email from login"
...
This reverts commit a66efbddb8eaa837cf42aae20b76c08274271dcf.
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: 4bce232139014e95590db93863a8c34d3a7779cf
Component: engine
2017-03-15 10:43:18 -07:00
a5a1a8eade
Merge pull request #31302 from dnephin/purge-orphaned-services
...
Add --prune to stack deploy
Upstream-commit: b0d1936d304824dc0438b200d269e2d4e0751fcc
Component: engine
2017-03-15 12:57:06 +01:00
b73bcff65d
misleading default for --update-monitor duration
...
Signed-off-by: erxian <evelynhsu21@gmail.com >
Upstream-commit: 3e6ff87f692d38ecfabf7508b54c8280333770a4
Component: engine
2017-03-15 14:20:02 +08:00
b85681b72c
Merge pull request #31147 from adshmh/30629-print-escaping-hint-on-invalid-interpolation-format
...
docker stack deploy interpolation format error due to not escaping $ now includes a hint
Upstream-commit: 95b46ff68fefdbd9b792768d0ca141589b493cbd
Component: engine
2017-03-14 17:14:09 -07:00
6a9291e20f
Add --prune to stack deploy.
...
Add to command line reference.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 644fd804fce63499812259331b0a9f2a4a3ebcc4
Component: engine
2017-03-14 16:09:28 -04:00
258019e01c
Fix environment resolving.
...
Load from env should only happen if the value is unset.
Extract a buildEnvironment function and revert some changes to tests.
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: a9c86b63c03fc3557748d7792c11041387cb93d9
Component: engine
2017-03-14 16:00:43 -04:00
52e6564dcd
compose: fix environment interpolation from the client
...
For an environment variable defined in the yaml without value,
the value needs to be propagated from the client, as in Docker Compose.
Signed-off-by: Akihiro Suda <suda.akihiro@lab.ntt.co.jp >
Upstream-commit: ea43c33330ec9a1e9a9b8a85348c1757fdae65c4
Component: engine
2017-03-14 15:59:40 -04:00
d136f71978
Merge pull request #31809 from vieux/bump_api
...
bump API to 1.28
Upstream-commit: 1a24abe42d1ad08b60c406b4cf95956dbc110ed6
Component: engine
2017-03-14 11:53:52 -07:00
2dc7385741
Merge pull request #31795 from dnephin/compose-file-v3.2
...
Compose file v3.2
Upstream-commit: cd56476f1862ae03cd125779e1d1f9fab293c248
Component: engine
2017-03-14 14:10:24 -04:00
975e2e2d89
Merge pull request #30597 from dnephin/add-expanded-mount-format-to-stack-deploy
...
Add expanded mount format to stack deploy
Upstream-commit: 49376cddab7d2ea28fd08fbbb75522656a72ed09
Component: engine
2017-03-14 17:53:28 +00:00
9aea8ad976
bump API to 1.28
...
Signed-off-by: Victor Vieux <victorvieux@gmail.com >
Upstream-commit: cd173a603003f3b15f4bae13e2e27b7ee1a46942
Component: engine
2017-03-14 09:32:50 -07:00
5fe9aafe47
Merge pull request #31500 from dperny/fix-service-logs-cli
...
Add tail and since to service logs
Upstream-commit: 1d4608032d95b846418cdf6a718061d20fed7f48
Component: engine
2017-03-14 14:19:29 +01:00
95794e3edc
Merge pull request #31710 from sanimej/drillerrr
...
Add verbose flag to network inspect to show all services & tasks in swarm mode
Upstream-commit: cdf66ba715c573f85338a2b2a432db6cb9a48e6d
Component: engine
2017-03-13 21:12:32 -07:00
ff11389227
Enhance network inspect to show all tasks, local & non-local, in swarm mode
...
Signed-off-by: Santhosh Manohar <santhosh@docker.com >
Upstream-commit: 14f76a21db71c5a817cb4d1e27f9940cefd5c820
Component: engine
2017-03-13 17:52:08 -07:00
38cad21bc6
Merge pull request #31672 from dperny/service-logs-formatting
...
Service logs formatting
Upstream-commit: aa733ba8a85a116a1d4a92ac59cddd9e1b4ab8ea
Component: engine
2017-03-13 19:08:55 -04:00
af1bbd0867
Add compose file version 3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: e7bf5be18b1a97b6f2b5eb6c6976fe9544589efe
Component: engine
2017-03-13 16:20:42 -04:00
0bac9da8c9
Refactor container run cli command.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 6a21a127ab5437f12731576653c751a9758aabb8
Component: engine
2017-03-13 16:05:51 -04:00
b2d648703b
Move endpoint_mode under deploy and add it to the schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
Upstream-commit: 751552c65f244917ce74d09d0f528308a6b35755
Component: engine
2017-03-13 15:00:56 -04:00
a8bf637055
support both endpoint modes in stack
...
Signed-off-by: allencloud <allen.sun@daocloud.io >
Upstream-commit: 96790657288699146f579382f25d932c87125e86
Component: engine
2017-03-13 15:00:49 -04:00
067b63e8af
Merge pull request #31579 from ijc25/cpuacct
...
Correct CPU usage calculation in presence of offline CPUs and newer Linux
Upstream-commit: 2c6a1e1878975550cd2e7a98494773903e39eaf7
Component: engine
2017-03-13 16:32:18 +00:00
dbf0cb1010
Merge pull request #30788 from ripcurld0/hide_win_opts
...
Hide command options that are related to Windows
Upstream-commit: be453c5a13f1945f1deb12308ba0600e72284365
Component: engine
2017-03-13 16:15:29 +01:00
14b850d8cb
Merge pull request #30648 from allencloud/do-not-fail-fast-when-inspect
...
do not fail fast when executing inspect command
Upstream-commit: 562d2dc978c6489a776f9550416bef9e111baefd
Component: engine
2017-03-13 16:04:04 +01:00
