tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
1,830 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

132 Commits

Author SHA1 Message Date
Guillaume Tardif a2e0f16f07
Merge pull request #592 from docker/fix_compose_ls_tests 
Fix `compose ls` tests
 2020-09-08 09:06:39 +02:00
aiordache 9098405313 Fix `compose ls` tests 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-07 17:06:35 +02:00
Chris Crone 7545485f78
Merge pull request #591 from docker/flaky-aci 
Attempt to fix flaky ACI tests
 2020-09-07 17:05:58 +02:00
Chris Crone e4e77bd198 e2e.aci: Retry flaky HTTP GET requests 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-07 13:43:49 +02:00
Guillaume Tardif d06aa2827f Move containers, compose, secrets to /api 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-07 13:22:08 +02:00
Guillaume Tardif 7138ecc899 ACI : when following logs (actually polling logs), stop polling when the container is not running anymore. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 15:46:35 +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
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 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 981665b02c Better renaming 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-24 16:09:20 +02:00
Guillaume Tardif 2bac8cf94e Fix linter 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 21:28:15 +02:00
Guillaume Tardif 7204692e3a Use test name instead of arbitrary string that needs to be different for each test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:46:31 +02:00
Guillaume Tardif 30884ad91a Display executed commands (prefixed with test name for readable logs in // runs) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:46:17 +02:00
Guillaume Tardif da6334f415 Renaming, expect commands to succeed by default (removed a bunch of res.Assert(success) ) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 18:45:38 +02:00
Chris Crone 4c6280b0e9 Rename docker/api -> docker/compose-cli 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-21 17:28:39 +02:00
Guillaume Tardif e19a740102 Adapt aci compose test reflecting the change. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-21 09:59:50 +02:00
Guillaume Tardif 64dd7a5674 Check that AZURE creds are defined when running E2E tests 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-19 11:58:02 +02:00
Guillaume Tardif 6ad48b9212 Updated ACI e2e flaky test to avoid failing when https://github.com/docker/desktop-microsoft/issues/49 happens 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-18 12:42:01 +02:00
Guillaume Tardif 27e7a0ced3
Merge pull request #475 from docker/aci_volume_keys 
Get storage account key from azure login, no need to specify it in compose file or run -v option
 2020-08-14 17:55:56 +02:00
Guillaume Tardif a86854effd Slightly update timeout, failing on windows nodes (https://github.com/docker/api/runs/984443961). Didn’t want to make it too long either, avoid waiting 2 mins to see when it’s failing. We’ll update this again if we see it’s not enough. 2020-08-14 12:42:19 +02:00
Guillaume Tardif 3a60c957ae Get storage account key from azure login, no need to specify it in compose file or run -v option 2020-08-14 12:26:09 +02:00
Guillaume Tardif 104b3d4dc8 Change ACI test region to eastus2. Improve error output when waiting for container status 2020-08-14 12:12:06 +02:00
Djordje Lukic aa8bf1daaa Add test for ACI start 2020-08-12 14:50:47 +02:00
Guillaume Tardif 3d758b7f26 Implement `docker ps —all` filter on ACI 2020-08-12 11:59:36 +02:00
Guillaume Tardif ee062e8333 ACI Stop implementation 2020-08-12 10:32:35 +02:00
Djordje Lukic f44d29f4df Fix the rm test without force 
mutlierror didn't append an `Error:` if there is only one error...
 2020-08-11 17:06:45 +02:00
Djordje Lukic 80c1b2246b
Merge pull request #457 from docker/feat-aci-force-rm 
Add --force to rm on ACI
 2020-08-11 16:42:49 +02:00
Djordje Lukic 093a69136f Add --force to rm on ACI 
If a container is running the user must force the removal of the
container.
 2020-08-11 16:30:42 +02:00
Guillaume Tardif ec5f4e9202 Add options to `docker login azure` to support Service Principal login. Use it in E2E tests 2020-08-11 12:11:51 +02:00
Chris Crone fc64f2923b aci-e2e: Windows fixes 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-10 17:23:50 +02:00
Chris Crone 017053e19a tests.e2e: Refactor 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-08-10 14:12:46 +02:00
Ulysses Souza a2c2d6aa5d Add Restart Policy support when running single container 2020-08-04 16:57:58 +02:00
aiordache 87245ef727 rename packages ( amazon to ecs and azure to aci ) 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-07-30 11:34:34 +02:00
Djordje Lukic 4480d27595 Don't set the container name in the test 
This will help us catch errors such as
https://github.com/docker/desktop-microsoft/issues/42
 2020-07-16 10:39:41 +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 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
Guillaume Tardif 492ce96dd4 Implement azure logout 2020-07-08 17:48:10 +02:00
Guillaume Tardif 7cd0b3c159 Separate ACI e2e tests, allowing to run a single one 2020-07-08 16:54:45 +02:00
Guillaume Tardif a2ea2347ba Remove It() in e2e tests, simplified step declaration. Nicer test output for all tests 2020-07-08 16:54:45 +02:00
Guillaume Tardif c5cd0f44f8 Fix ACI e2e tests : do not use console if no tty option set in exec 2020-07-07 14:05:25 +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 f7daa70c87 Add ACI e2e test starting mysql with typical env vars 2020-07-07 12:22:56 +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 e4c1a1f945 Fix `docker compose up` with default project name being derived from current working dir. has been fixed upstream in compose-go (see https://github.com/compose-spec/compose-go/pull/56) 2020-07-06 16:56:30 +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 4a1b50a9cd
Merge pull request #326 from docker/run_follow_logs 
Run containers and attach to logs by default, detach with -d option
 2020-07-02 17:02:33 +02:00
Guillaume Tardif 5eea111ecf Run containers and attach to logs by default, detach with -d option 2020-07-02 16:45:04 +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
Djordje Lukic 94a530b05f Make log stream test more readable 2020-06-30 18:26:38 +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 fdc2bd34d7 Add test for `logs --follow` on ACI 2020-06-30 17:13:51 +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 eda438aaed Added basic support for service principal login, run ACI e2e tests with it 2020-06-29 20:35:23 +02:00
Guillaume Tardif 2df807abca Uses compose update e2e test to also test compose exposing multiple ports 2020-06-24 18:20:27 +02:00
Guillaume Tardif daf7061e30
Merge pull request #244 from docker/aci_dns_sidecar 
Aci dns sidecar
 2020-06-19 11:49:04 +02:00
Guillaume Tardif 76a1753396 ACI e2e required change, because the output includes the progress info. 2020-06-18 17:45:01 +02:00
Djordje Lukic ad72c866cc Add license headers 2020-06-18 16:48:03 +02:00
Guillaume Tardif f403307edf Allow compose updates without having to delete the stack every time. 
Update will “typically” keep the same IP, but this isn’t guaranteed by azure
(ACI has limitations on what can be updated, but this does not apply to us for the moment : https://docs.microsoft.com/en-us/azure/container-instances/container-instances-update#properties-that-require-container-delete)
For the moment I check in the test that the IP is keep the same
 2020-06-18 10:03:28 +02:00
Guillaume Tardif 404f2629a3 Changed compose flag —name to —project-name, -p, aligned with docker-compose flag. 2020-06-17 07:17:58 +02:00
Guillaume Tardif 113350a09d Context create aci is now a subcommand, as Moby and example. Root `docker context create` also allows backward compatibility to create docker contexts as before 2020-06-15 12:19:06 +02:00
Guillaume Tardif f1a5f2d6cf Backend is responsible for generating containers IDs and truncate them if wanted/supported for docker ps 2020-06-08 12:37:33 +02:00
Guillaume Tardif 774bfea341 Refactoring, add unit test or various interactive context creation 2020-06-03 10:55:55 +02:00
Guillaume Tardif 5675763856 Interactive context create, adding method CreateContextData to CloudService interface, so Cloud Backends can provide a custom context creation method. 2020-06-02 16:04:08 +02:00
Christopher Crone 7d49706acf Refactor e2e suite code 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-20 18:08:07 +02:00
Christopher Crone a8146ad59c Rework e2e tests into suite 
Signed-off-by: Christopher Crone <christopher.crone@docker.com>
 2020-05-20 15:57:10 +02:00
Ulysses Souza d2fece3311 Fix linter problems 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:16:36 +02:00
Ulysses Souza 762f462d80 Get "run" test back to main function 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:16:34 +02:00
Ulysses Souza bdd987f246 Refactor placement and method name 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:13:12 +02:00
Ulysses Souza d28e5fd742 Add e2e-aci tests for volumes 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 10:13:08 +02:00
Ulysses Souza a33f3e17f8 Fix typo 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-20 06:45:06 +02:00
Djordje Lukic 5effbdc31f Add ACI public ip 2020-05-18 11:36:46 +02:00
Ulysses Souza 323601865d Test output of `docker run` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-13 17:09:18 +02:00
Ulysses Souza b98f45eb28 Enable "run->rm" cycle on e2e-aci 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-13 10:44:04 +02:00
Ulysses Souza 7ff1899021 Format with goimport and refactor consts 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-13 10:44:04 +02:00
Ulysses Souza 14fb12c8c8 Let `make protos` affect host files 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-05-13 10:44:04 +02:00
Guillaume Tardif 153e7c1e11 Moved sample compose files in test folder 2020-05-07 09:35:25 +02:00
Guillaume Tardif 13db3437fd ACI Container ids work fine between ps, log & exec, either from single container (docker run) of multi-container compose stack 2020-05-06 22:15:33 +02:00
Guillaume Tardif 9a2ec752b5 Add ACI compose basic e2e test 2020-05-06 15:56:47 +02:00
Guillaume Tardif eb712ac75f Added aci e2e tests, not run in CI since requiring azure login. 
Need a `docker rm` command to add nginx e2e test, and compose sample to follow
 2020-05-06 15:48:01 +02:00