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

305 Commits

Author SHA1 Message Date
Ulysses Souza 3e9095a873 Fix docker context ls for retrocompatibility 
It writes each context as an independent object line

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 6c883dc4a5 Print only the information present in pretty on json 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 604cf0c911 Add comment on legacy --json option 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 044e7f571d Remove go template from help on list commands 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza fb59c9385d Fix tests 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 0f6f547214 Refactor Print method for lists 
This also fixes in the case of nil list

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 8961805412 Add json output format to several commands 
- docker context ls
- docker ps
- docker compose ls
- docker compose ps
- docker secret ls
- docker volume ls
- docker version

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Guillaume Tardif abd6af6386
Merge pull request #704 from ulyssessouza/add-envFile 
Add envFile arguments to run command
 2020-10-01 13:55:24 +02:00
Ulysses Souza 2e899202ec Add envFile arguments to run command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 06:19:08 +02:00
Ulysses Souza 277702dc6b Add argument support to run command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-30 15:34:22 +02:00
Guillaume Tardif b9d6c2e701 Add volume as a new served API, use `one of` in proto for context specific parameters, proxy volume creation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-28 14:56:32 +02:00
Guillaume Tardif ca35ccfb0e ACI Volumes : create takes one required arg, instead of required flag `--fileshare` (we still have required flag `--storage-account` specifically for ACI) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-24 17:10:32 +02:00
Guillaume Tardif cf3bb18c0e User compose.service.domainname rather than custom ACI extension for ACI DNSLabelName 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:44:22 +02:00
Guillaume Tardif 334ebf5f75 Implement --domainname flag on compose up, also defining compose extension "x-aci-domain-name" to store ACI DNSLabelName. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif 268c02523a Only add `--domainname` flag to `docker run` in ACI context 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif 701d1b834e ACI: allow users to set DNSLabelName and deploy containers with fqdn like `myapp.eastus.azurecontainers.io` 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif f42e05fcc3
Merge pull request #636 from docker/update-copyright 
Update copyright
 2020-09-22 12:21:16 +02:00
Guillaume Tardif 772493d70d
Merge pull request #617 from ulyssessouza/volumes_ro 
Add 'readOnly' capability to volumes on ACI
 2020-09-22 12:14:31 +02:00
Chris Crone d154c41586 Update copyright 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-22 12:13:00 +02:00
Ulysses Souza 02d59ae510 Add 'readOnly' capability to volumes on ACI 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-18 12:07:42 +02:00
Guillaume Tardif 3ccc603461 Add status field in CLI metrics : success, failure, cancelled 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-18 10:47:50 +02:00
Guillaume Tardif 292ec55f46 Check specified subscription in context create and if not found, prompt users they might need to login with -—tenant-id. 
Cf https://github.com/docker/aci-integration-beta/issues/27

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-17 22:05:43 +02:00
Nicolas De loof 6d35a6d644
Merge pull request #609 from docker/refacto_multi_error_format 
Remove duplicated code formatting multi errors
 2020-09-15 18:14:45 +02:00
Guillaume Tardif 267b267201 Progress functions can return a string, that can be used in the caller of progress.Run to display final result after progress display 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-14 14:29:03 +02:00
Guillaume Tardif 2ce4e98d88 In version, replace “Azure integration” version info by “Cloud integration” 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-11 17:29:40 +02:00
Guillaume Tardif b85eddd09c Remove duplicated code formatting multi errors 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-11 16:08:14 +02:00
Guillaume Tardif 57ded74aee
Merge pull request #598 from docker/encode_env_values 
Properly send env variables containing “=“ in their value in ACI payload. Also properly send quoted values
 2020-09-10 17:17:02 +02:00
Guillaume Tardif 98f0064fe9 Properly send env variables containing “=“ in their value in ACI payload. Also properly send quoted values 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 17:03:34 +02:00
Guillaume Tardif 0b3fdb637d Change volume IDs from “storageaccount@fileshare“ to “storageaccount/fileshare” 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 16:07:22 +02:00
Guillaume Tardif 07547d7b87 ACI Volume create flags are required 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 15:24:51 +02:00
Guillaume Tardif 099b64935b Minor fixes 
Co-authored-by: Chris Crone <christopher.crone@docker.com>

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 14:55:46 +02:00
Guillaume Tardif 80d23a6097 Removed NAME from `volume ls` output, allow `volume delete <ID>` using IDs from `volume ls`. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 09:14:39 +02:00
Guillaume Tardif 38a8f5310b Volume command is only available in aci context type, with ACI specific flags 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 09:14:39 +02:00
Guillaume Tardif b96a6d1086 Add progress on volume creation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 17:54:45 +02:00
Guillaume Tardif 96d785a5bd Added volume delete, can delete juste a file share or the storage account if confirmed 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 16:32:16 +02:00
Guillaume Tardif dcbc1c3fb2 Volume cli minor refactor 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 08562b403e Connecting it all 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 9ed06ece5b Adding volume API & initial CLI command 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 64a28f6636 Also move client => api/client 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-07 13:23:06 +02:00
Guillaume Tardif d06aa2827f Move containers, compose, secrets to /api 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-07 13:22:08 +02:00
Guillaume Tardif f24f02bbbb
Merge pull request #581 from docker/remove_delete_alias 
Remove delete alias, no reason to add this (does not exist in Moby)
 2020-09-04 15:47:27 +02:00
Nicolas De loof a8c290fe98
Merge pull request #583 from docker/compose_ls 2020-09-04 14:13:27 +02:00
Guillaume Tardif 1a41d0a90b Remove delete alias, no reason to add this (does not exist in Moby) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 13:22:28 +02:00
aiordache 02be463fd7 Add `compose ls` command for ECS 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-04 13:20:11 +02:00
Ulysses Souza 15066ce999 Add 'kill' command 
- On ACI that's implemented as a stop,
since ACI does not implement a kill

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-04 02:57:54 +02:00
Guillaume Tardif c7e2db077e
Merge pull request #544 from docker/simulation 
Introduce ECS emulation mode
 2020-09-01 15:18:32 +02:00
Nicolas De Loof fed50d79f2
introduce ecs-local context 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 15:30:05 +02:00
Nicolas De Loof 7f8bb030e6
Introduce ECS emulation mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 10:01:52 +02:00
Guillaume Tardif b0c50ed6dd Implement compose ps on ACI 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-28 17:43:18 +02:00
Guillaume Tardif f80e90caca
Merge pull request #529 from docker/api 
Revisit compose API so it uses compose-go Project as parameter
 2020-08-27 11:52:27 +02:00
Nicolas De Loof edb30e7e82
Revisit compose API so it uses compose-go Project as parameter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-27 10:59:20 +02:00
Guillaume Tardif ed395a1e64 Display nice message on context creation (message taken from Moby cli) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-26 18:09:01 +02:00
Guillaume Tardif ad5c465bd1
Merge pull request #485 from docker/repo-rename 
Rename docker/api -> docker/compose-cli
 2020-08-25 15:58:51 +02:00
Ulysses Souza 59f7d7cd00 Redirect user from plugin usage to integrated ECS 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-08-24 19:29:10 +02:00
Chris Crone 4c6280b0e9 Rename docker/api -> docker/compose-cli 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-21 17:28:39 +02:00
Guillaume Tardif 69ce33321f
Merge pull request #528 from docker/secrets 
Secrets
 2020-08-21 14:52:36 +02:00
Nicolas De Loof 32adf3e4e6
Introduce `secret` management command and ECS implementation 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-21 13:56:52 +02:00
Guillaume Tardif bff1fa1872
Merge pull request #525 from docker/workingdir 
workdir default value is defined by compose file
 2020-08-21 10:22:31 +02:00
Nicolas De Loof 838937c907
workdir default value is defined by compose file 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-20 15:18:03 +02:00
Djordje Lukic 635ecd7b99 Return a default implementation when nil 
Some backends can decide not to implement a whole set of APIs (compose
for example), we now return a default implementation that returns a
`errdefs.ErrNotImplemented` for each action making it easy for the cli
to print a helpful error message. We also remove any possible nil
panics.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-08-20 14:32:03 +02:00
Guillaume Tardif 2df4112913
Merge pull request #511 from docker/ecs-e2e 
First ECS E2E test
 2020-08-20 10:57:23 +02:00
Guillaume Tardif 9b0b1129a6 Build without ecs build flag, not required anymore. Fix context create ecs command not build 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-20 10:11:23 +02:00
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
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
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 f8ce7a4780 cli: Move to gotest.tools 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-04 14:03:24 +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 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
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