tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
690 Commits 21 Branches 266 Tags 54 MiB
Commit Graph

146 Commits

Author SHA1 Message Date
Djordje Lukic a2edb5b64e Fix adding a tag to a container group 2020-07-16 10:01:49 +02:00
Djordje Lukic 45a7c7a422
Merge pull request #385 from docker/aci_tags 
Aci improvements on tags & single container run
 2020-07-13 11:35:22 +02:00
Guillaume Tardif 042fb66ad8 Better progress display: “Group xxx” for container group creation, then separate lines for containers. 
For single containers, there was a single mixed line now that the group and the container have the same name.
```
 $ ./bin/docker --context acitest run nginx
[+] Running 2/2
⠿ Group strange-bartik  Created         4.2s
⠿ strange-bartik        Done            20.6s
strange-bartik
``
 2020-07-13 11:23:06 +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 e2b0ee08ac Fixed wrong error message 2020-07-10 15:45:49 +02:00
Guillaume Tardif 23a03c59aa Change single container tag to `docker-single-container` ; added tag `docker-compose-application`. The compose tag is not used yet, can be useful for metrics, and maybe other things later on. 2020-07-10 15:45:49 +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 d21fd7b8cf Do not fail (divide by zero) if terminal width is not set. Improved a bit the ACI e2e test, happy that it catches this error (this was going to break the log gRPC API) 2020-07-10 13:00:41 +02:00
Guillaume Tardif eb5965c962
Merge pull request #380 from docker/remove-single-container-fixed-name 
Relax single container name and replace by using tags
 2020-07-10 11:32:16 +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
Ulysses Souza 3b85582c38 Relax single container name 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-07-09 10:40:50 +02:00
Guillaume Tardif 492ce96dd4 Implement azure logout 2020-07-08 17:48:10 +02:00
Christopher Crone 42a756f7d3 azure: Clean up volume parsing functions 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-07-08 13:40:40 +02:00
Guillaume Tardif 16acc36033
Merge pull request #356 from docker/fix-non-interactive 
Add check on exec looking for arguments
 2020-07-07 12:41:44 +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 0c27fd6236 Support environment variables defined in compose file: 
* KEY=VALUE
* KEY (no =VALUE) will fetch the process environment variable

envFile list is already parsed by compose-go and resolved to Environment key values no need to do anything for this.
 2020-07-07 11:39:35 +02:00
guillaume.tardif 2d73f180ed return error if pb opening browser for login 2020-07-07 10:28:04 +02:00
Ulysses Souza 35cbb621fb Add check on exec looking for arguments 
In the case where the command has arguments
it fails because ACI implementation does not
support commands with arguments

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-07-07 09:32:52 +02:00
guillaume.tardif 1d8e0ef9e6 Revert "Return an error if unable to open the browser" 
This reverts commit e22b0ba676.
 2020-07-07 09:19:06 +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 dbc109808d Better error message when trying to remove a container from a compose application 2020-07-03 15:58:17 +02:00
Guillaume Tardif aeb446ef4f
Merge pull request #334 from docker/fix_rm_compose_container 
Fix rm compose container
 2020-07-03 15:42:48 +02:00
Guillaume Tardif da3c3dab1c
@gtardif @rumpl Use %q instead of \"%s\" 
Co-authored-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-07-03 15:40:25 +02:00
Guillaume Tardif 0dcab4004d
Use %q instead of \"%s\" 
Co-authored-by: Djordje Lukic <djordje.lukic@docker.com>
 2020-07-03 15:39:44 +02:00
Guillaume Tardif 568dc6de23 Do not allow ACI single containers with name that includes separator used for compose services (this would breaks docker logs, docker exec, docker rm using <CONTAINER_ID>) 2020-07-03 13:39:45 +02:00
Djordje Lukic 0057093897 Sleep cancel sleep on log follow if the user cancels 2020-07-03 10:51:23 +02:00
Guillaume Tardif 76cb73c5c2 ACI : allow `docker compose down —project-name xxx` without requiring the compose file 2020-07-03 10:24:06 +02:00
Guillaume Tardif 6b74716490 Specific error message when user tries to remove one container from an ACI compose application, mentioning the name of the compose application and that user should use compose down 2020-07-03 10:03:46 +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 3c83e01e9c
Merge pull request #327 from docker/compose-go 
Use compose-go's Project and ProjectOptions
 2020-07-02 16:43:34 +02:00
Guillaume Tardif a9ef20eefd In ACI e2e tests, do not wait for full resource group deletion at the end, let ACI clean things UP (timeframe ~45 sec). This is costing GH Action minutes for nothing, and slows test results. 2020-07-02 16:13:38 +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 d3f1209bab Add test for the backtracking of lines 2020-07-02 11:11:09 +02:00
Djordje Lukic e852e8f96a Count the lines from the terminal, not from ACI 
Count the number of lines output on the terminal wrt the terminal width
so that we can go up the right amount.
 2020-07-02 10:38:03 +02:00
Djordje Lukic e22b0ba676 Return an error if unable to open the browser 
Also use github.com/pkg/browser instead of our own code
 2020-07-01 16:47:49 +02:00
Guillaume Tardif 514aa50ebc
Merge pull request #313 from docker/azure_multi_tenants 
Allow users to specify tenanted when logging into azure (if several tenants for azure account)
 2020-07-01 15:46:00 +02:00
Guillaume Tardif 29f8c81afc Hide sidecar container from compose progress 2020-07-01 15:08:18 +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 664c48ba1e
Merge pull request #306 from docker/fix-credential-check 
Fix credential checking on ACR image (for linux)
 2020-06-30 22:16:40 +02:00
Guillaume Tardif 94877b18ab
Merge pull request #304 from docker/aci_inspect_memory_cpu 
In ACI inspect, display memory limit in bytes, like Moby `docker inspect`.
 2020-06-30 22:16:01 +02:00
Djordje Lukic fdc2bd34d7 Add test for `logs --follow` on ACI 2020-06-30 17:13:51 +02:00
Djordje Lukic 06596dcd90 Follow logs on ACI. 
This is not ideal, the ACI API doesn't give us a stream of logs, so we
need to fake it by moving the cursor up and rewriting the logs to
stdout. This means that, on gRPC side, we will stream the whole logs
each time. This is ok for now but we need to push Azure to give us a
real streaming API for logs
 2020-06-30 16:34:32 +02:00
Ulysses Souza a72ffee4ff Fix credential checking on ACR image (for linux) 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-30 16:11:54 +02:00
Guillaume Tardif 96075236ee In ACI inspect, display memory limit in bytes, like Moby `docker inspect`. 
Displaying in Gb also was rounding memory to zero if set to 0.xGb
 2020-06-30 12:10: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