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

273 Commits

Author SHA1 Message Date
Guillaume Tardif 333e4e5675
Merge pull request #787 from docker/add-abs-path-secret-target 
Support absolute paths for secrets
 2020-10-16 11:59:27 +02:00
Anca Iordache 05295b5e8a
Merge pull request #765 from docker/ecs_default_profile 
Populate ~/.aws/config(credentials) on ecs context create
 2020-10-16 11:33:03 +02:00
aiordache c2af0a136a Populate ~/.aws/config(credentials) on ecs context create 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-10-15 20:26:38 +02:00
Ulysses Souza 06e44a813c Support absolute paths for secrets 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-15 15:46:07 +02:00
Guillaume Tardif 50a2ae1100 Display summary of reclaimed ACI resources (CPU/mem) in `docker prune` 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-15 15:45:48 +02:00
Chris Crone bb9b059288
Merge pull request #785 from docker/disable_more_aci_tests 
Make ACI exec test less strict to handle differing outputs
 2020-10-15 09:45:57 +02:00
Guillaume Tardif a5e34323e2 Add `docker prune` command and ACI implementation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-14 17:48:11 +02:00
Guillaume Tardif 1bd5ed56bc Make one ACI test less strict, we still encounter issues related to deployments on Atlas platform (errors on `docker exec`: failed to read input from container: ws closed: 1000, cf https://github.com/docker/compose-cli/runs/1247798295) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-14 14:35:00 +02:00
Ulysses Souza 660c7bbdcf Add command "volume inspect" 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-14 11:11:55 +02:00
Guillaume Tardif 1a4d45dd06 Too flaky, see https://github.com/docker/compose-cli/runs/1246970427 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-13 12:28:22 +02:00
Guillaume Tardif 9f5f1cc4c3 Add debug information when mysql cannot start on ACI E2E test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-13 09:37:12 +02:00
Guillaume Tardif be4b9a6812
Merge pull request #760 from docker/add-quiet-flags 
Add --quiet for some commands
 2020-10-13 09:00:58 +02:00
Guillaume Tardif 7b8255c953 Replaces windows carriage return for windows tests 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-12 17:23:47 +02:00
Guillaume Tardif a4f10c171e Test DB Startup timeout 60s => 90s 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-12 16:48:18 +02:00
Guillaume Tardif 5b54816a1a
Merge pull request #757 from docker/secrets-refactor 
Squash all secrets in a single one
 2020-10-12 14:40:59 +02:00
Ulysses Souza 45212c6e21 Squash all secrets in a single one 
Also adds an e2e test

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-12 14:17:37 +02:00
Guillaume Tardif 0dfea32250 Revert "Temporarily disable some red ACI tests, to be put reverted once the platform is back to green (hopefully in a day or 2)" 
This reverts commit b10acc1a60.

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-12 14:08:22 +02:00
Ulysses Souza 6c1ea32dae Add --quiet for some commands 
- compose ls
- compose ps
- secret ls // Not implemented on ACI so no e2e-aci tests
- volume ls

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-12 11:34:27 +02:00
Ulysses Souza 99186b1d04 Look for all mounts before removing a volume 
This checks the volume mounts of all container groups from all
resource groups before removing a volume/fileshare

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-09 14:39:21 +02:00
Guillaume Tardif 289c83efe2 HttpRetry : do not get stuck on first call, timeout http requests and retry in case of failures 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-09 14:27:24 +02:00
Guillaume Tardif 4f87422a79 more debug info when ports available but hostIP is empty ; Seems to be a race where container has status running but not yet an IP allocated 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-09 14:09:09 +02:00
Ulysses Souza 019268dded Fix e2e tests on comparing with empty string 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-09 13:21:17 +02:00
Guillaume Tardif 68d0413e36 Minor cleanup 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-09 11:53:53 +02:00
Guillaume Tardif 6516632ecf Add resource reservations to container inspect 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-08 17:47:16 +02:00
Guillaume Tardif b1edfb6507 Change inspect json output to group things a bit more nicely, and more like Moby json output 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-08 17:03:30 +02:00
Guillaume Tardif a09983b474 Do not send metrics for help commands 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-08 14:47:31 +02:00
Guillaume Tardif 0d3f7186c5 Hardcoded list of commands and simplified metrics gathering. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-08 11:59:12 +02:00
guillaume.tardif cd09351b0a Fix ACI E2E test on windows (file path) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-07 10:38:33 +02:00
Guillaume Tardif 9ad06e55b5 E2e test on metrics 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-07 10:11:46 +02:00
Guillaume Tardif 6fa93db021
Merge pull request #724 from gtardif/json_context_format 
Allow `docker context ls —formatter {{json.}}` to not delegate to Moby and include context type in the json
 2020-10-06 18:12:54 +02:00
Guillaume Tardif a1bb2d5abe Allow `docker context ls —formatter {{json.}}` to not delegate to Moby and include context type in the json 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-06 18:00:35 +02:00
Guillaume Tardif 9cc914ef07 No need for docker dependency for CopyDir, and yaml parser. 
No need for multiport compose file with volumes

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-06 17:54:26 +02:00
Ulysses Souza f8a3aec64d Add aci volumes e2e test 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-06 17:22:57 +02:00
Guillaume Tardif 5c0a953f7e
Merge pull request #731 from docker/atlas_test_disable 
Temporarily disable some red ACI tests
 2020-10-06 13:51:32 +02:00
Guillaume Tardif b10acc1a60 Temporarily disable some red ACI tests, to be put reverted once the platform is back to green (hopefully in a day or 2) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-06 13:29:27 +02:00
Ulysses Souza d9115d4089 Add windows golden file for `context ls` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-06 11:50:27 +02:00
Guillaume Tardif 97576db803
Merge pull request #689 from ulyssessouza/json-out 
Add json output format to several commands
 2020-10-05 10:30:30 +02:00
Guillaume Tardif 71238b261d Running tests in many regions to avoid per region limit when we run too many // things in the CI 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-05 09:36:43 +02:00
Ulysses Souza e4fff081db
Merge pull request #711 from docker/fix_aci_500 
ACI tests : Wait for http status and retry if necessary.
 2020-10-02 17:30:23 +02:00
Guillaume Tardif 6d0f7f399f Fix regression: let users login to local registry (no '.' In registry name) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-02 13:54:59 +02:00
Guillaume Tardif a07b1db9f1 Wait for http status and retry if necessary. We were getting 500 errors because database is not ready initially 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-01 18:09:34 +02:00
Ulysses Souza b8a1e6c888 Change JSON output to individual lines 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
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 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