tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,298 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

309 Commits

Author SHA1 Message Date
aiordache 6657dd2774 Add error message for aws context 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-19 18:22:07 +02:00
aiordache 44b2b8b21d integrate functionality from ecs-plugin 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-19 17:49:21 +02:00
aiordache fe0cc0d2cc Add progress.Run to down cmd 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-19 16:19:21 +02:00
Nicolas De Loof ec4615ae57
Apply linter recommendations 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-19 08:16:19 +02:00
Nicolas De Loof 2791542fea
Merge remote-tracking branch 'origin/main' into ecs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-18 10:36:17 +02:00
Nicolas De Loof cfbd963c3d
Adjust commands to latest compose-go 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-18 10:01:32 +02:00
Nicolas De Loof e02d8d549b
Make ECS integration a compose-cli backend 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-17 21:30:49 +02:00
Guillaume Lours 95de770e87 Update or add license header which are not valid 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2020-08-17 16:55:25 +02:00
Guillaume Tardif b060d8acfc Do not display warning if cannot forward signal to child. See https://github.com/docker/pinata/pull/14327 2020-08-13 14:06:52 +02:00
Djordje Lukic 88c405e025 Use buffered channels for signals 2020-08-13 10:34:42 +02:00
Djordje Lukic aa8bf1daaa Add test for ACI start 2020-08-12 14:50:47 +02:00
Djordje Lukic 1a3182fb7f Implement `docker start` for ACI 2020-08-12 14:50:47 +02:00
Guillaume Tardif ee062e8333 ACI Stop implementation 2020-08-12 10:32:35 +02:00
Djordje Lukic 611667d252 Fix linting 2020-08-11 17:36:54 +02:00
Sebastiaan van Stijn c862d7821d
Remove custom multierrors package 
The hashicorp/go-multierror package provides functionality to do
this. Replacing the custom package in favor of those (at the cost
of some small duplication).

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2020-08-11 17:24:51 +02:00
Djordje Lukic 80c1b2246b
Merge pull request #457 from docker/feat-aci-force-rm 
Add --force to rm on ACI
 2020-08-11 16:42:49 +02:00
Djordje Lukic 093a69136f Add --force to rm on ACI 
If a container is running the user must force the removal of the
container.
 2020-08-11 16:30:42 +02:00
Guillaume Tardif 6ff20cf104
more concise validation 
Co-authored-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-08-11 13:45:46 +02:00
Guillaume Tardif ec5f4e9202 Add options to `docker login azure` to support Service Principal login. Use it in E2E tests 2020-08-11 12:11:51 +02:00
aiordache 00f17534a3 error check 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-06 18:13:17 +02:00
aiordache 64c517f375 remove unused parameter 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-06 18:13:17 +02:00
aiordache 46e58a28d0 Add ps and logs to compose API 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-06 18:13:17 +02:00
Anca Iordache 4c3c219518
Merge pull request #411 from docker/enable_ecs 
Enable ecs backend
 2020-08-06 12:17:00 +02:00
aiordache 42a5dfc0d2 rename runCompose() to checkComposeSupport() 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-06 12:02:11 +02:00
aiordache bb3500d77b check with client if context is supported (has a backend) 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-06 11:49:54 +02:00
Guillaume Tardif cdd4028788 Fix flaky nil pointer in signal forwarding to child process (see https://github.com/docker/api/runs/949400778) 2020-08-06 10:23:12 +02:00
Guillaume Tardif 29fe26620a Stop forwarding signals to child process when the child terminates 2020-08-05 15:05:32 +02:00
Guillaume Tardif 05a8582126 Forward all signals to child process 2020-08-05 15:05:32 +02:00
aiordache d1b8bcb2c7 fix signal passing to mobycli 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-08-05 15:05:32 +02:00
Guillaume Tardif f442eafe0b Validate run restart option value. Default value is “none”, instead of “no”, this is more in line with compose values, and changes only the default so should not have too much impact on legacy usage. 2020-08-04 17:11:21 +02:00
Ulysses Souza a2c2d6aa5d Add Restart Policy support when running single container 2020-08-04 16:57:58 +02:00
Chris Crone 0e92fd21d0 cli.options: Do not test port list order 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-04 16:31:02 +02:00
Chris Crone f8ce7a4780 cli: Move to gotest.tools 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-04 14:03:24 +02:00
aiordache 5f7c284d58 update delegation test to check all context types 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:40:44 +02:00
aiordache 87245ef727 rename packages ( amazon to ecs and azure to aci ) 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
aiordache 2471e51b39 set build tag for the ecs context and backend 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
aiordache cfa7406d73 fix tests 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
aiordache fb63373a9b remove cluster property from aws context 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
aiordache 355295696f Create aws context 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
aiordache 648f0139df add e2e test for compose up on default context 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-29 17:33:23 +02:00
aiordache 5a26b25709 handle compose on all context types 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-29 11:58:09 +02:00
aiordache cfd6d2f5d1 Error out for contexts not implementing compose command 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-28 16:30:08 +02:00
Christopher Crone d1a929eb7f cli: Fix logout when specifying a registry 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-17 16:29:12 +02:00
Christopher Crone af0417c758 cli: Refactor Azure logout 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-17 16:23:15 +02:00
Djordje Lukic 84dbd1467d Move the struct for creating and aci context to azure package 2020-07-13 11:05:19 +02:00
Guillaume Tardif 43b54ef75a Also remove map[string]string for azure login (tenantId param) 2020-07-10 16:55:44 +02:00
Guillaume Tardif 97d408d25d Replaced map[string] string by existing aciCreateOpts struct for context create 2020-07-10 16:39:09 +02:00
Guillaume Tardif c36b64c10b Fixing subscription-id parameter not passed to backend... 2020-07-10 15:27:41 +02:00
Guillaume Tardif 1fbdbbbbe3
Merge pull request #381 from docker/fix-logs-windows 
Get the real width of the terminal
 2020-07-10 13:06:07 +02:00
Guillaume Tardif 52c2d09eae
Merge pull request #376 from docker/logout 
Implement azure logout
 2020-07-10 09:48:39 +02:00
Djordje Lukic ef2d304762 Allow non-interactive exec on ACI 
If the request is for a non-interactive exec we don't attach the stdin
when executing.
 2020-07-09 11:47:22 +02:00
Djordje Lukic e6c115dc17 Get the real width of the terminal 
github.com/buger/goterm always returns 80 on windows...
 2020-07-09 10:50:48 +02:00
Guillaume Tardif 492ce96dd4 Implement azure logout 2020-07-08 17:48:10 +02:00
Guillaume Tardif c5cd0f44f8 Fix ACI e2e tests : do not use console if no tty option set in exec 2020-07-07 14:05:25 +02:00
Guillaume Tardif cb3ac513cc Add run env variables support (KEY=AVLUE or KEY, will grab the process env value). 
No support yet for env files
 2020-07-07 11:39:35 +02:00
Guillaume Tardif efea5c8c83
Merge pull request #352 from docker/fix_error_cancel_logs 
Exit without error message if user canceled command
 2020-07-07 11:27:33 +02:00
Guillaume Tardif 0776e79e8e Exit without error message if user canceled command (typical scenario : ACI `logs — follow` and ctrl-C while querying ACI) 2020-07-06 17:28:02 +02:00
Guillaume Tardif 7296290408 Add ”Platform” in docker inspect result, showing container OS (this field is used by VSCode) 2020-07-06 12:16:02 +02:00
Guillaume Tardif ae76e0cf27
Merge pull request #325 from docker/error_status_context_needs_login 
Specific exit code when command fails because azure login is required
 2020-07-02 17:02:57 +02:00
Guillaume Tardif 4a1b50a9cd
Merge pull request #326 from docker/run_follow_logs 
Run containers and attach to logs by default, detach with -d option
 2020-07-02 17:02:33 +02:00
Guillaume Tardif 5eea111ecf Run containers and attach to logs by default, detach with -d option 2020-07-02 16:45:04 +02:00
Guillaume Tardif 3c83e01e9c
Merge pull request #327 from docker/compose-go 
Use compose-go's Project and ProjectOptions
 2020-07-02 16:43:34 +02:00
Nicolas De Loof 622402709a
Use compose-go's Project and ProjectOptions 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-07-02 16:05:45 +02:00
Guillaume Tardif 964e331a10 Specific exit code when command fails because azure login is required. Will be used by VSCode Docker integration 2020-07-02 13:52:57 +02:00
Djordje Lukic e4354c82d1 Make sure we can have a console 2020-07-02 11:49:39 +02:00
Djordje Lukic 8e8c868a70
Merge pull request #322 from docker/fix_attach_logs 
Fix logs replacement when streaming logs on windows
 2020-07-02 10:37:27 +02:00
Guillaume Tardif 736b7a4707 Fix logs replacement when streaming logs on windows 2020-07-02 10:17:55 +02:00
Guillaume Tardif bba9e055af Allow users to specify tenanted when logging into azure (if several tenants for azure account) 2020-07-01 12:27:18 +02:00
Guillaume Tardif f0ab42e109
Merge pull request #300 from docker/aci_ci 
Run ACI e2e tests in the CI with basic support for service principal login
 2020-06-30 10:29:13 +02:00
Guillaume Tardif 88ccad0449
Merge pull request #297 from docker/aci_exec_it 
Let -it go through for aci exec, same as -t flag for the moment.
 2020-06-30 09:45:34 +02:00
Guillaume Tardif eda438aaed Added basic support for service principal login, run ACI e2e tests with it 2020-06-29 20:35:23 +02:00
Guillaume Tardif d71ae04936 Let -it flag go through for aci exec, same as -t for the moment. 
Will need to check how we can implement -I specifically on ACI
 2020-06-29 10:50:04 +02:00
Ulysses Souza 1deb2b8b09 Integrate limits on inspect 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:32:28 +02:00
Ulysses Souza 0a57fd7d5c Add cpu and memory limits 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:28:43 +02:00
Djordje Lukic d5b674fba9
Merge pull request #291 from docker/chore-cleanup 
Cleanup entrypoint
 2020-06-26 17:21:39 +02:00
Guillaume Tardif d97f9d68fd Add missing f shorthand for version command 2020-06-26 12:35:51 +02:00
Djordje Lukic 98976e4cb4 Cleanup entrypoint 
* use the `fatal` function when we can
* rename moby.ExecRegardlessContext to Exec
 2020-06-26 10:23:37 +02:00
Guillaume Tardif 4fb039164d
Merge pull request #289 from gtardif/automate_version_from_tag 
Automate version from tag
 2020-06-25 15:58:00 +02:00
Guillaume Tardif 0bcba8d1d2 Set LD_FLAG version from git tag. Displayed version will be (default behaviour of git describe —tags): 
* release version : if tag `v0.1.2` is exactly on the built commit : `0.1.2` (strip v when displaying `docker version`)
* dev version : if tag `v0.1.2` is 3 commits before, and we are on commit `xyz` : `0.1.2-3-xyz` 
* will only match tags starting with `v[0-9]`
 2020-06-25 13:50:16 +02:00
Djordje Lukic 908212a947 Add version in the main package 
This way, when we release goreleaser will inject the right version in
the ldflags
 2020-06-25 12:00:37 +02:00
Guillaume Tardif 839b1b0b44 Delegate to Moby CLI, to allow executing ecs CLI plugin if user has switched to the AWS context (created by the plugin) 2020-06-25 11:49:28 +02:00
Guillaume Tardif 0d75d58089 Bump version 0.1.4 2020-06-24 11:38:34 +02:00
Guillaume Tardif bf76fe2f32 Bump version to 0.1.3 2020-06-23 17:05:07 +02:00
Djordje Lukic 0c1f0f81df Usage metrics 
Send usage to Docker Desktop
 2020-06-23 16:52:52 +02:00
Guillaume Tardif e24f2a36c2
Merge pull request #269 from docker/aci_detach_flags 
Add ACI detach flags
 2020-06-23 16:43:42 +02:00
Guillaume Tardif 90914603ba Add ACI detach flags, not used at the moment, but more makes new command more compatible with previous ones. 2020-06-23 16:17:02 +02:00
Guillaume Tardif fa8b911cd8 Allow running `docker -v` or `--version` even if context is not default 2020-06-23 15:13:43 +02:00
Guillaume Tardif 4197ef8b68
Merge pull request #263 from docker/fix_host_flag 
Shell out to Moby cli if user uses -H, regardless of context set.
 2020-06-23 14:57:54 +02:00
Guillaume Tardif ab39310771 Allow --format on docker context ls. Fixing VS Code extension shellout 2020-06-23 13:25:43 +02:00
Guillaume Tardif 38d4f8d25a Shell out to Moby cli if user uses -H, regardless of context set. Moby cli will refuse both options (context & host) to be set at the same time 2020-06-23 12:00:46 +02:00
Guillaume Tardif 03f11e2953
Merge pull request #247 from docker/main_command_cleanup 
Main command cleanup
 2020-06-23 10:35:07 +02:00
Guillaume Tardif c3924f2e8e Add -H flag to our own version command & login command, & also —-log-level (-l) flag. 2020-06-22 18:22:18 +02:00
Guillaume Tardif 2824a7a736 Context aci create : check context name does not exists before starting interactive aci create 2020-06-22 18:20:40 +02:00
Guillaume Tardif dbaab41604 Changed root level debug shorthand to capital D, make it consistent with Moby flag and not clash with —detach future option 2020-06-22 13:19:37 +02:00
Guillaume Tardif ef83880608 Version 0.1.2 2020-06-21 09:05:17 +02:00
Guillaume Tardif 45750fe104 Do not display “docker for the 2020s” as the first help line ! 2020-06-19 12:21:31 +02:00
Guillaume Tardif 8eb380a5a4 So much for golang error processing... 2020-06-19 11:21:47 +02:00
Djordje Lukic ad72c866cc Add license headers 2020-06-18 16:48:03 +02:00
Guillaume Tardif ba5eb3b865 CLI version 0.1.0 => 0.1.1 2020-06-18 12:25:10 +02:00
Djordje Lukic a1bb04ebe1 Refactor calling the progress writer to make it easier 2020-06-18 12:10:36 +02:00