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

843 Commits

Author SHA1 Message Date
Djordje Lukic 14b2e54c06
Merge pull request #318 from docker/chore-browser 
Return an error if unable to open the browser
 2020-07-01 16:55:24 +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
Djordje Lukic c9449dbf83
Merge pull request #315 from docker/fix_cve_guava 
Fix cve guava
 2020-07-01 15:59:32 +02:00
Guillaume Tardif 8bdb4dee77 Remove debug stuff from web images, that is causing apt-get install issues 2020-07-01 15:47:41 +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
Djordje Lukic 41c84ac313
Merge pull request #316 from docker/feat-ecs-metrics 
Add ecs as a management command
 2020-07-01 15:30:33 +02:00
Djordje Lukic 3a1cb0aaa0 Add ecs as a management command 
This, with the "compose" being a management command makes it possible to
track ecs usage. See tests for more info
 2020-07-01 15:18:35 +02:00
Djordje Lukic 5b79bb613a
Merge pull request #317 from docker/fix-master-ci 
Indent master-ci.yml
 2020-07-01 15:18:29 +02:00
Djordje Lukic 7a9a3d0e7e Indent master-ci.yml 2020-07-01 15:15:44 +02:00
Djordje Lukic e1967921bd
Merge pull request #314 from docker/hide_sidecar 
Hide sidecar container from compose progress
 2020-07-01 15:13:36 +02:00
Guillaume Tardif 29f8c81afc Hide sidecar container from compose progress 2020-07-01 15:08:18 +02:00
Guillaume Tardif 7cde96e8b6 Update guava to fix CVE 2020-07-01 14:59:23 +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 22b1de00ac
Merge pull request #309 from docker/win_aci_e2e 
Win aci e2e tests
 2020-07-01 10:53:40 +02:00
Guillaume Tardif efc1d21448 Add ACI e2e tests on windows, do not build with example + local contexts for ACI E2E on linux 2020-06-30 22:19:16 +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 fc4e0f6216
Merge pull request #308 from docker/test-stream-logs 
Make log stream test more readable
 2020-06-30 18:32:46 +02:00
Djordje Lukic 94a530b05f Make log stream test more readable 2020-06-30 18:26:38 +02:00
Guillaume Tardif 84e1522400
Merge pull request #301 from docker/no_double_build_on_master 
Avoid running build twice on master with master.yml
 2020-06-30 18:18:47 +02:00
Guillaume Tardif a48c4fb41c
Merge pull request #307 from docker/aci_e2e_group 
Random ACI group name for tests, otherwise we are conflicting with each other + the CI
 2020-06-30 18:18:16 +02:00
Guillaume Tardif f850dc557d Random ACI group name for tests, otherwise we are conflicting with each other + the CI. 
Same for storage account name (outside of the scope of resource group)
 2020-06-30 18:13:07 +02:00
Djordje Lukic 614a62b388
Merge pull request #305 from docker/feat-stream-aci-logs 
Follow logs on ACI.
 2020-06-30 17:49:00 +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 e5e87d3357
Merge pull request #302 from gtardif/aci_e2e_readme 
Doc on running e2e tests
 2020-06-30 11:54:20 +02:00
Guillaume Tardif 7fac6bf766 Avoid running build/tests/lint twice on master with master.yml 2020-06-30 11:52:44 +02:00
Guillaume Tardif 6d2d510027 Doc on running e2e tests 2020-06-30 11:31:49 +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
Guillaume Tardif f3cbbc48b8 Aci e2e tests moved to master build only 2020-06-30 10:14:19 +02:00
Guillaume Tardif 2268f0c598 Renamed Login method specific to tests, to make things more explicit 2020-06-30 10:11:06 +02:00
Guillaume Tardif 82ff8dcd7d Fix resource limit defaults and make aci e2e tests pass 2020-06-30 10:10:23 +02:00
Guillaume Tardif 5d29124498
Merge pull request #298 from docker/fix-aci-tail 
Send the `tail` parameter to ACI if present
 2020-06-30 09:45:48 +02:00
Guillaume Tardif 88ccad0449
Merge pull request #297 from docker/aci_exec_it 
Let -it go through for aci exec, same as -t flag for the moment.
 2020-06-30 09:45:34 +02:00
Guillaume Tardif eda438aaed Added basic support for service principal login, run ACI e2e tests with it 2020-06-29 20:35:23 +02:00
Djordje Lukic 6a5973597d Send the `tail` parameter to ACI if present 2020-06-29 15:40:58 +02:00
Djordje Lukic 169e3a9b1f
Merge pull request #296 from docker/chore-logrus 
Use logrus for logging, not containerd's log
 2020-06-29 15:10:41 +02:00
Djordje Lukic 37f4c36c32 Use logrus for logging, not containerd's log 2020-06-29 15:02:05 +02:00
Guillaume Tardif 2b5e6f0038
Merge pull request #278 from docker/limits 
Limits for CPU and Memory
 2020-06-29 13:32:25 +02:00
Guillaume Tardif d71ae04936 Let -it flag go through for aci exec, same as -t for the moment. 
Will need to check how we can implement -I specifically on ACI
 2020-06-29 10:50:04 +02:00
Guillaume Tardif c1b0dd2e31
Merge pull request #284 from docker/aci_e2e_compose_multiport_update 
Uses compose update e2e test to also test compose exposing multiple ports
 2020-06-29 10:37:50 +02:00
Ulysses Souza 1deb2b8b09 Integrate limits on inspect 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:32:28 +02:00
Ulysses Souza 0a57fd7d5c Add cpu and memory limits 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-06-29 10:28:43 +02:00
Djordje Lukic b84be73ce7
Merge pull request #295 from docker/dependabot/go_modules/github.com/containerd/containerd-1.3.5 
Bump github.com/containerd/containerd from 1.3.4 to 1.3.5
 2020-06-29 10:22:24 +02:00
dependabot-preview[bot] d2178c4219
Bump github.com/containerd/containerd from 1.3.4 to 1.3.5 
Bumps [github.com/containerd/containerd](https://github.com/containerd/containerd) from 1.3.4 to 1.3.5.
- [Release notes](https://github.com/containerd/containerd/releases)
- [Changelog](https://github.com/containerd/containerd/blob/master/RELEASES.md)
- [Commits](https://github.com/containerd/containerd/compare/v1.3.4...v1.3.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2020-06-26 21:25:58 +00:00
Djordje Lukic 878b7a3823
Merge pull request #292 from docker/chore-update-protos 
Update protobuf tp 1.25.0
 2020-06-26 17:21:47 +02:00
Djordje Lukic d5b674fba9
Merge pull request #291 from docker/chore-cleanup 
Cleanup entrypoint
 2020-06-26 17:21:39 +02:00
Djordje Lukic e3b6a470fa
Merge pull request #293 from docker/version_f_shorthand 
Add missing f shorthand for version command
 2020-06-26 15:38:50 +02:00