tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,210 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

2210 Commits

Author SHA1 Message Date
Nicolas De Loof 49415afe5d docker-compose parity: start implies `--detach` (otherwise, use `up`) 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 17:55:38 +01:00
Nicolas De Loof 8533a26929 make color assignment predictable and option to disable prefixes/colors 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 17:55:38 +01:00
Nicolas De loof 54a7819cbe
Merge pull request #1290 from docker/restart_logs 2021-02-12 17:54:38 +01:00
Nicolas De loof 4d05e0234a
Merge pull request #1287 from docker/scale 2021-02-12 17:47:01 +01:00
Nicolas De Loof 4462f12249
revisit `run` implementation as create, attach, start, wait 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 17:45:02 +01:00
Nicolas De Loof bbdced6f0b
test case 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 15:07:30 +01:00
Nicolas De Loof 9601aa5af3 add support for up --scale 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 14:32:43 +01:00
Nicolas De Loof d56745cba4 detect stopped containers as "Created" 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-12 12:17:17 +01:00
Guillaume Tardif f52bdc54d8
Merge pull request #1281 from gtardif/compose_unittests 
More Local Compose unit tests
 2021-02-12 12:12:57 +01:00
Guillaume Tardif d720eb6c03 Fix race (parallel update of collection) to remove orphan containers 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-12 10:26:15 +01:00
Guillaume Tardif fbe1ebc054 Fix test name and avoid project name collision between parallel tests, 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-12 09:52:04 +01:00
Guillaume Tardif ac5c422d77 Better debug info if test fail 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-12 09:45:00 +01:00
Guillaume Tardif b39208ec92
Merge pull request #1264 from gtardif/compose_orphans_warning 
Compose orphans warning
 2021-02-11 16:17:24 +01:00
Guillaume Tardif b4fa7b2fa3 PS unit test 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-11 15:53:06 +01:00
Guillaume Tardif 4140196eb0 Add down unit tests 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-11 15:53:05 +01:00
Guillaume Tardif b8093e668a Kill Unit test mocking docker client API 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-11 15:52:23 +01:00
Guillaume Tardif bf26d056e5 Fix orphans warning when `docker compose run` 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-11 15:34:38 +01:00
Guillaume Tardif c8b708a20b Fix orphans warning when running `docker compose up SERVICE` 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-11 15:33:29 +01:00
Nicolas De loof 5ddcc84a3d
Merge pull request #1263 from docker/exitCodeFrom 2021-02-11 14:26:40 +01:00
Nicolas De Loof 8b90814de6
e2e test 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-11 13:26:58 +01:00
Nicolas De Loof d9fe745cc0
avoid use of channels in API for gRPC compatibility 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-11 09:34:08 +01:00
Nicolas De Loof 752edcce65
introduce `--exit-code-from` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 19:17:12 +01:00
Nicolas De Loof a4b003ecfa
pull logs and events better than aggregate events from multiple channels 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:27:36 +01:00
Nicolas De Loof 17c26e81ff capture exit code and log as ERROR 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:07:24 +01:00
Nicolas De Loof 06b033db6c `Event` is way too generic noon 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:07:24 +01:00
Nicolas De Loof 27d640dd41 e2e test and alignment with docker-compose output 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:07:24 +01:00
Nicolas De Loof f3d093cb54 introduce cascade stop "--abort-on-container-exit" option 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:07:24 +01:00
Nicolas De Loof 7a7114fb5f Capture container exit code and dump on console 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-09 17:07:24 +01:00
Guillaume Tardif 1562af9e41
Merge pull request #1249 from aiordache/kube_convert_cmd 
Kube backend: Add `compose convert`
 2021-02-09 11:31:26 +01:00
Nicolas De loof c663ea6ffe
Merge pull request #1260 from gtardif/down_warn_nothing_to_remove 
Down warning when nothing to remove
 2021-02-09 10:49:03 +01:00
aiordache f21326a319 Add output flag for writing chart files 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-08 18:10:02 +01:00
Guillaume Tardif ec302a2e10 Fix display glitch when sending a single “Done” event with no previous “Working” event ont he same ID 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-08 17:21:18 +01:00
Guillaume Tardif 58e10a7af2 Display warning in `docker compose down` if nothing to remove (no container, no network) 
For reference, `docker-compose` displays `WARNING: Network sentences_default not found`

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-08 17:20:36 +01:00
Guillaume Tardif ec26ba5230
Merge pull request #1256 from ulyssessouza/e2e-secrets 
Add content based e2e tests for configs and secrets
 2021-02-08 16:18:36 +01:00
Guillaume Tardif 66fb7903ad
Merge pull request #1246 from ulyssessouza/label-envfiles 
Add environment_files label on service's `env_file` section
 2021-02-08 16:09:44 +01:00
Guillaume Tardif ff5e3a5e92
Merge pull request #1245 from aiordache/kube_logs_cmd 
Kube backend: Implement `compose logs`
 2021-02-08 16:08:37 +01:00
aiordache 9be77beb73 Add compose logs test 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-08 15:20:49 +01:00
aiordache 1e7ce90561 Kube backend: add the `compose logs` command 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-08 15:19:47 +01:00
aiordache a9247e5412 Kube backend: add `compose convert` for displaying the generated chart content 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-08 15:18:12 +01:00
Guillaume Tardif 9f56fc9fd6
Merge pull request #1258 from docker/red-e2e_compose_flags 
Adapt e2e tests to compose flag order
 2021-02-08 15:11:35 +01:00
Guillaume Tardif a5affa447f Adapt e2e tests to compose flag order 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-08 11:33:10 +01:00
Ulysses Souza b9f34a168b Add content based e2e tests for configs and secrets 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-08 02:57:02 -03:00
Guillaume Tardif a5b148bda1
Merge pull request #1251 from gtardif/compose_health_display 
Remove the HEALTH column in `docker compose ps`
 2021-02-05 17:55:04 +01:00
Ulysses Souza dc80f6b6e7 Add environment_files label 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-05 10:59:54 -03:00
Guillaume Tardif 24d40ba6ac
Merge pull request #1226 from docker/loglevel 
Add support for --log-level
 2021-02-05 12:38:13 +01:00
Guillaume Tardif ad140697fc Remove the HEALTH status in `docker compose ps` and combine values from fields “state” and “health”. Rename column STATE => STATUS. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-05 12:19:45 +01:00
Guillaume Tardif 42adbaeb8e
Merge pull request #1250 from docker/fix_logs 
Filter out one_off containers on `compose logs`
 2021-02-05 11:36:49 +01:00
Anca Iordache 2c22717624
Merge pull request #1244 from gtardif/kube_compose_ps 
Kube compose ps
 2021-02-05 11:22:14 +01:00
Nicolas De Loof a1bc5c721d
Filter out one_off containers on `compose logs` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-05 11:15:43 +01:00
Guillaume Tardif de7ce7084e
Merge pull request #1241 from ulyssessouza/add-configs-bind 
Add configs bind mount support
 2021-02-05 11:15:23 +01:00