tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,468 Commits 23 Branches 268 Tags
Commit Graph

258 Commits

Author SHA1 Message Date
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 b10acc1a601e4f4c75d6fefbdc2ea138a687c5ed.

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-10-12 14:08:22 +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
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