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

230 Commits

Author SHA1 Message Date
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 7941e048a1 Fix ACI e2e : now we support passing commands, set `--domainname` before the image in the cmd 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-01 12:56:47 +02:00
Guillaume Tardif b8968e83cd Do not fail when constructing error message for commands not implemented. Use metrics GetCommand() the is already used 3 lines above for metrics tracking. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-30 10:49:14 +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 7eda96bea4 Fix nil pointer when creating volume with “” storage account 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-24 12:59:29 +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 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 7abdb085c0
Merge pull request #637 from docker/volume_tests 
Added tests on ACI volume conversion, mock storageLogin required to get storage account keys
 2020-09-22 14:40:46 +02:00
Guillaume Tardif 0092de6df1 Added tests on ACI volume conversion, mock storageLogin required to get storage account keys 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:24:12 +02:00
Chris Crone d154c41586 Update copyright 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-22 12:13:00 +02:00
Guillaume Tardif 17bda79ca1 Changing e2e test PATH to make windows tests pass 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-17 17:13:05 +02:00
Guillaume Tardif 9c6aead797 Allow running commands with HOME=“”. 
Do not try to create ~/.docker before using CONFIG_DIR. HOME=“” will result in trying to use a relative .docker folder as default config folder, and if we cannot create the context store for any reason, try delegate to Moby CLI.

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-17 09:08:17 +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 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 c7a456ab83
Merge pull request #593 from docker/volume_create 
ACI Volume create
 2020-09-10 15:32:12 +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 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
Nicolas De Loof d4c745a7a8
AWS CI environment is not dedicated to tests 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-09-08 15:47:24 +02:00
Guillaume Tardif 2f672f6c4c Volume e2e test 
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 171ab1bd0c Most common scenario is to use `compose ls` without name option, and list all stacks 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 10:11:51 +02:00
Guillaume Tardif a2e0f16f07
Merge pull request #592 from docker/fix_compose_ls_tests 
Fix `compose ls` tests
 2020-09-08 09:06:39 +02:00
aiordache 9098405313 Fix `compose ls` tests 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-07 17:06:35 +02:00
Chris Crone 7545485f78
Merge pull request #591 from docker/flaky-aci 
Attempt to fix flaky ACI tests
 2020-09-07 17:05:58 +02:00
aiordache 3ed90ea467 replace check with Equal in e2e test 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-07 14:49:15 +02:00
aiordache 19a707495f add test for compose ls 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-07 14:39:49 +02:00
Chris Crone e4e77bd198 e2e.aci: Retry flaky HTTP GET requests 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-07 13:43:49 +02:00
Chris Crone 6f0f9e5600 e2e.framework: Add helper to retry HTTP requests 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-07 13:43:48 +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 7138ecc899 ACI : when following logs (actually polling logs), stop polling when the container is not running anymore. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 15:46:35 +02:00
Guillaume Tardif c7e2db077e
Merge pull request #544 from docker/simulation 
Introduce ECS emulation mode
 2020-09-01 15:18:32 +02:00
Guillaume Tardif 58cb3491ae Wait only for the first “DELETE_COMPLETE” line when running `docker compose down` (~4 secs, instead of waiting 8-9 mins for the entire aws stack to be deleted), and let aws fully delete stack async. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-01 09:33:13 +02:00
Nicolas De Loof 4d11594df0
default description if none set by user 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 17:10:59 +02:00
Nicolas De Loof 4693ce91f6
e2e test to check ecs-local context creation 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 16:54:02 +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 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
Guillaume Tardif a61c2d16de
Merge pull request #537 from docker/e2e_better_logs 
E2e improvements
 2020-08-24 17:12:15 +02:00
Guillaume Tardif 981665b02c Better renaming 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-24 16:09:20 +02:00
Guillaume Lours 10b7197e4a Remove version in test compose files 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2020-08-24 10:15:42 +02:00
Guillaume Tardif 2bac8cf94e Fix linter 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 21:28:15 +02:00
Guillaume Tardif 7204692e3a Use test name instead of arbitrary string that needs to be different for each test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:46:31 +02:00
Guillaume Tardif 30884ad91a Display executed commands (prefixed with test name for readable logs in // runs) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:46:17 +02:00
Guillaume Tardif da6334f415 Renaming, expect commands to succeed by default (removed a bunch of res.Assert(success) ) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:45:38 +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 e05603a5ca More ECS E2E tests (secrets), in // of compose 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 15:56:00 +02:00