tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-07 19:55:07 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,198 Commits 24 Branches 268 Tags
Commit Graph

1198 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Guillaume Tardif
1a41d0a90b Remove delete alias, no reason to add this (does not exist in Moby) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 13:22:28 +02:00
Guillaume Tardif
cbb416976a
Merge pull request #577 from docker/aci_device_login_ctrlc 
ACI: Allow Ctrl+C to cancel CLI when using Azure Device Code Flow login
 2020-09-04 13:07:54 +02:00
Guillaume Tardif
303958bb44
Merge pull request #574 from ulyssessouza/alias-rm-kill 
Add 'kill' as an alias to 'stop'
 2020-09-04 13:07:38 +02:00
Guillaume Tardif
f107747ffe
Merge pull request #580 from docker/fix_aws_context 
Fix bug not allowing users to run any context command when set to an aws context type.
 2020-09-04 12:09:41 +02:00
Guillaume Tardif
adeba9b124 Fix bug not allowing users to run any context command when set to an aws context type. 
When users have an “aws" context type, we try to exec the command (will execute context ls, context use, etc.) and when it fails because it doesn’t find the aws backend, then display the custom error for aws context type.

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 11:01:55 +02:00
Ulysses Souza
15066ce999 Add 'kill' command 
- On ACI that's implemented as a stop,
since ACI does not implement a kill

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-04 02:57:54 +02:00
Guillaume Tardif
76c92a8359 Pass in context to login tenant query, so it gets cancelled if the user Ctrl+C 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-03 18:21:30 +02:00
Nicolas De loof
a0a0e391cb
Merge pull request #573 from docker/simulation 2020-09-03 16:10:55 +02:00
Chris Crone
a09f42d85e
Merge pull request #579 from chris-crone/clarify-contributing 
Tidy and clarify contributing guide
 2020-09-03 16:00:45 +02:00
Chris Crone
966bbfe8b8 contributing: Tidy and clarify 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-03 15:54:20 +02:00
Guillaume Tardif
81f2496b5e Allow Ctrl+C to cancel CLI when using Azure Device Code Flow login 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-03 15:38:38 +02:00
Guillaume Tardif
9b0dd5d8cd
Merge pull request #575 from docker/aci_login_fallback 
Azure fallback to device code flow if we can’t open a browser
 2020-09-03 08:59:39 +02:00
guillaume.tardif
bb58290eeb invoke browser with Run rather than Start, to get errors (on wsl no interop setup, and more generally if the browser app returns an error) 
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
 2020-09-02 17:31:04 +02:00
Guillaume Tardif
909be662ee Azure fallback to device code flow if we can’t open a browser (some WSL2 scenarios) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-02 15:46:17 +02:00
Nicolas De Loof
7104b8126a
another hack-ish hack to support compose logs 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-09-01 16:02:06 +02:00
Nicolas De Loof
4bd8a8860f
implement "down" with (yet another) docker-compose hack 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-09-01 15:35:31 +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
eb0af4b711
Merge pull request #572 from chris-crone/readme-minor-fixes 
readme: Minor fixes
 2020-09-01 11:56:52 +02:00
Chris Crone
770a9312f0 readme: Minor fixes 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-01 11:51:56 +02:00
Guillaume Tardif
217da21514
Merge pull request #568 from docker/ecs_e2e_down 
Wait only for the first “DELETE_COMPLETE” line when running `docker compose down`
 2020-09-01 10:11:11 +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
b9153961ab
Merge pull request #564 from docker/aci_compose_ps 
Implement compose ps on ACI
 2020-08-31 16:43:07 +02:00
Nicolas De Loof
fed50d79f2
introduce ecs-local context 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 15:30:05 +02:00
Nicolas De Loof
c1ecb2b7be
Check we have compose 1.27 or later 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 10:01:53 +02:00
Nicolas De Loof
7f8bb030e6
Introduce ECS emulation mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 10:01:52 +02:00
Nicolas De loof
ed1776fec0
Merge pull request #562 from docker/dns 
Check VPC has DNS resolution enabled
 2020-08-28 19:57:20 +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
Nicolas De Loof
cd27fcb9c8
Check VPC has DNS resolution enabled 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-28 10:59:48 +02:00
Guillaume Tardif
f80e90caca
Merge pull request #529 from docker/api 
Revisit compose API so it uses compose-go Project as parameter
 2020-08-27 11:52:27 +02:00
Guillaume Tardif
92a0c60095
Merge pull request #558 from docker/warning_msg_typo 
Removed space before :
 2020-08-27 11:34:16 +02:00
Guillaume Tardif
2ea000b280 Removed space before : 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-27 11:30:48 +02:00
Guillaume Tardif
7f278fa2c3
Merge pull request #553 from docker/debug_acr_login_error 
In case of error while auto-login to ACR registry, print error info in addition to warning.
 2020-08-27 11:27:59 +02:00
Guillaume Tardif
7c891ff3ee
Merge pull request #554 from docker/context_create_output 
Display nice message on context creation (message taken from Moby cli)
 2020-08-27 11:27:02 +02:00
Nicolas De Loof
edb30e7e82
Revisit compose API so it uses compose-go Project as parameter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-27 10:59:20 +02:00
Guillaume Tardif
8dbb6c58b9 Print ACR login debug info 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-27 10:50:21 +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
970ac218d3
Merge pull request #552 from docker/maintainers 
Fix Maintainers
 2020-08-26 12:07:40 +02:00
Guillaume Tardif
d7afb45ead
Merge pull request #535 from chris-crone/readme-open-source 
readme: Prep for open source
 2020-08-26 12:03:57 +02:00
Guillaume Tardif
2bd3ce9eef Include linux install dock & script, split README with BUILDING.md & INSTALL.md 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-26 10:59:16 +02:00
Chris Crone
59eaa8e93b readme: Prep for open source 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-26 10:59:16 +02:00
Nicolas De loof
e4d4da3968
Merge pull request #551 from docker/remove_dependabot 
Remove dependabot and add a check-dependencies command in make file
 2020-08-26 10:50:23 +02:00
Guillaume Tardif
a9a6d3bf1d Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com> 2020-08-26 10:50:12 +02:00
Guillaume Lours
ae45e08d43 Remove dependabot and add a check-dependencies command in make file 
Signed-off-by: Guillaume Lours <guillaume.lours@docker.com>
 2020-08-26 09:54:01 +02:00
Guillaume Tardif
50b2a2fa17
Merge pull request #546 from docker/fix_last_docker_api 
Fix last references to /docker/api
 2020-08-25 16:56:47 +02:00
Guillaume Tardif
4879e88b04 Fix last references to /docker/api 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-25 16:26:36 +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
Guillaume Tardif
c284d23096
Merge pull request #483 from ulyssessouza/fail-on-ecs-as-plugin 
Redirect user from plugin usage to integrated ECS
 2020-08-25 15:38:00 +02:00
Guillaume Lours
b6a7b985f5
Merge pull request #543 from docker/dependabot/go_modules/gopkg.in/ini.v1-1.60.1 
build(deps): bump gopkg.in/ini.v1 from 1.60.0 to 1.60.1
 2020-08-24 23:53:56 +02:00