tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,415 Commits 20 Branches 267 Tags 56 MiB
Commit Graph

337 Commits

Author SHA1 Message Date
Guillaume Tardif 8b6e356af4 Fix compose up --build not forcing rebuild of present image 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-03-02 18:12:51 +01:00
Nicolas De loof 0037e0755f
Merge pull request #1377 from docker/pull_deps 
introduce pull --include-deps
 2021-03-02 15:51:38 +01:00
Nicolas De Loof e9c9a1983c
pass timeout to "up" backend implementation 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 15:07:19 +01:00
Nicolas De loof 03bce03028
Merge pull request #1378 from docker/build_pull 
support compose build --pull
 2021-03-02 10:00:59 +01:00
Nicolas De Loof 6412d88703
introduce build --progress 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 09:34:38 +01:00
Nicolas De Loof 7495b192b8 introduce --always-recreate-deps 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 09:18:24 +01:00
Nicolas De Loof 6f73007265
support compose build --pull 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 09:06:21 +01:00
Nicolas De Loof 7c4c534b36
introduce --renew-anon-volumes 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 08:38:15 +01:00
Nicolas De loof dd843bded8
Merge pull request #1353 from ulyssessouza/project-dir 
Fix --project-directory mix with --workdir
 2021-03-01 17:58:47 +01:00
Guillaume Tardif f6354e5617
Merge pull request #1351 from gtardif/scan_suggest 
Scan suggest message when compose build / compose up
 2021-02-26 10:12:14 +01:00
Guillaume Tardif c1373d2e63 Update confirmed scan suggest message 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-26 09:41:18 +01:00
Ulysses Souza bc234bdcdf Fix --project-directory mix with --workdir 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-25 17:48:44 -03:00
Guillaume Tardif accc65ae8b Check if scan has already been invoked before suggesting using it 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-25 10:32:56 +01:00
Guillaume Tardif fa3a08e4fc Check scan plugin is available before suggesting to use it 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-25 09:25:49 +01:00
Guillaume Tardif 81acdba670 Allow users to turn off scan suggest with env var 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-25 09:25:49 +01:00
Guillaume Tardif 30631eea03 scan message in compose build and compose up 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-25 09:25:49 +01:00
Guillaume Tardif 156efb8463 Scan suggest message in docker compose build 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-25 09:25:36 +01:00
Nicolas De loof c53398a422
Merge pull request #1348 from gtardif/compose_ls_all 
Add —all option to compose ls, listing non running projects.
 2021-02-24 15:17:34 +01:00
Guillaume Tardif cba4f140ae Add —all option to compose ls, listing non running projects. 
Added e2e tests to stop, start, pause, unpause, ls —all, ps —all

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-24 13:11:12 +01:00
Guillaume Tardif bc9bd9f880 Moving compose e2e tests in their own files 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-24 10:53:06 +01:00
Ulysses Souza 83cc63c8ae Add service based network_mode 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-23 10:13:31 -03:00
Guillaume Tardif ea24e499e6
Merge pull request #1341 from docker/run_opts 
introduce a few more `compose run` options
 2021-02-23 13:59:30 +01:00
Nicolas De Loof ed17e762cc
introduce a few more `compose run` options 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-23 13:41:50 +01:00
Nicolas De Loof 8054af8011
introduce --no-build option 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-23 10:42:51 +01:00
Nicolas De Loof e362947cb1
introduce pause and unpause commands 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-22 17:08:41 +01:00
Nicolas De Loof 2b0e0f2741
pass service to LogConsumer 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-22 11:40:26 +01:00
Nicolas De loof 32fdd08485
Merge pull request #1323 from docker/timestamp 
introduce logs --timestamp
 2021-02-18 19:41:05 +01:00
Chris Crone 931767b22d deps: Replace docker/distribution for distribution/distribution 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-02-18 18:24:52 +01:00
Chris Crone a4a3a38dd8 lint: Fix linting errors 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2021-02-18 17:29:05 +01:00
Nicolas De Loof c25fd5689e
intorude logs --timestamp 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-18 16:50:39 +01:00
Nicolas De Loof f07a4a72b9
introduce --rmi and --volumes option on down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-17 16:11:35 +01:00
Nicolas De loof 5e7203dbe4
Merge pull request #1306 from aiordache/compose_exec_cmd 
Add `compose exec` command
 2021-02-16 14:15:48 +01:00
Nicolas De Loof 12a5100b20 reconcide log's wplit_writer implementations 
close #1311

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-16 10:59:28 +01:00
Nicolas De Loof 9097d71009 join log stream before we split by line 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-16 10:59:28 +01:00
Nicolas De loof bd9248d074
Merge pull request #1303 from docker/down_timeout 
introduce timeout flag on down and stop
 2021-02-16 10:59:02 +01:00
aiordache afac025a49 Add `compose exec` command 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-02-16 10:56:00 +01:00
Nicolas De loof 8029db807c
Merge pull request #1301 from docker/color_fix 
fix color assignment on status messages
 2021-02-16 10:43:16 +01:00
Nicolas De Loof 0b517741a0 introduce --timeout on compose stop|down 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-16 10:21:01 +01:00
Ulysses Souza 6b79a6c096 Add cascade test cleanup with `down` 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-15 20:04:59 -03:00
Nicolas De Loof 5cb2533faa
dryrun to collect resources to be removed, then remove 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-15 12:32:44 +01:00
Nicolas De Loof 4fcaa29614
fix color assignment on status messages 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-15 12:29:48 +01:00
Nicolas De Loof 20b83aa237
introduce compose rm command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-15 09:26:52 +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 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 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 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 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 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 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
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
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
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
Ulysses Souza 8d8934e449 Add configs bind mount support 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-02-04 19:24:34 -03:00
Nicolas De Loof 9f80214dc2
Make -l -D -H non-persistent to avoid conflict with subcommands 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-04 17:13:44 +01:00
Guillaume Tardif bf56815251 Adding e2e test for local compose healthcheck in compose ps 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-03 12:54:22 +01:00
Nicolas De Loof 4cbb33e20d
Add support for --log-level 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-03 11:49:21 +01:00
Nicolas De Loof 0aa3f4a189
Add kill command 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-03 10:44:26 +01:00
Nicolas De loof 4d3d7c11ca
Merge pull request #1211 from docker/health 
Add HEALTH column to compose ps
 2021-02-02 16:58:26 +01:00
Nicolas De loof 9ef7850076
Merge pull request #1216 from docker/profiles 
Introduce --profile option
 2021-02-02 16:57:02 +01:00
Nicolas De Loof 9b282b69f8
Introduce --all option on compose ps 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-02 13:58:27 +01:00
Nicolas De Loof b1f864a6f8
Introduce --profile option 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-02 13:51:22 +01:00
Nicolas De Loof c4f6b1bd14
Add HEALTH column to compose ps 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-02-01 17:40:30 +01:00
Guillaume Tardif 6215445b8a
Merge pull request #1196 from gtardif/kube_expose_LoadBalancer 
Support exposing ports and cross-service communication
 2021-02-01 15:39:31 +01:00
Guillaume Tardif aa1efb885a Fix kube selectors : do not only select on serviceName, also ProjectName 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-02-01 12:22:41 +01:00
Guillaume Tardif 134744709c
Merge pull request #1201 from ulyssessouza/bump-compose-fo 
Bump compose-go for absolute paths fix
 2021-02-01 09:19:37 +01:00
Ulysses Souza bf17797070 Adapt tests to use absolute paths 
- This also includes IDE linter formating

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-30 17:31:56 -03:00
Guillaume Tardif 3252c409f8 Make progress event display homogeneous between up, down, start, stop 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-01-29 16:51:37 +01:00
Nicolas De Loof 9d9dbf3a1f
Can't set `-f` as shortcut for `--follow` : conflict with `--file` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-29 15:17:44 +01:00
Nicolas De Loof 163f3b9a89 don't run "removeContainers" in parallel as we follow dependency order 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-29 15:14:04 +01:00
Nicolas De Loof 7d0e1dfc3c introduce compose logs --tail and --follow options 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-29 15:10:56 +01:00
Guillaume Tardif c9028f9f37
Merge pull request #1180 from docker/add-compose-stop 
Add start and stop commands
 2021-01-29 12:15:24 +01:00
Nicolas De loof c3443410fe
Merge pull request #1190 from docker/recreate_flags 
introduce --force-recreate and --no-recreate
 2021-01-29 11:25:11 +01:00
Ulysses Souza cd233ceb5c Add defensive code 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-28 13:28:53 -03:00
Nicolas De Loof 9e77499c2a
introduce --force-recreate and --no-recreate 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-28 15:25:41 +01:00
Ulysses Souza 4ff20bdda8 Add start and stop commands 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-01-27 17:18:10 -03:00
Guillaume Tardif 6a03c4ff03 Fixing linter after rebasing 
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
 2021-01-26 18:20:00 +01:00
Guillaume Tardif 3f474143ad
Merge pull request #1163 from docker/stop-on-ctrlc 
Stop project on Ctrl+C
 2021-01-26 17:08:32 +01:00
Nicolas De Loof f33eff5903
introduce `--filter` option on `compose ls` 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-22 10:27:56 +01:00
Dominik Braun effc126237
Make `--file` and `--project-name` global compose options 
Signed-off-by: Dominik Braun <mail@dominikbraun.io>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-01-20 14:40:08 +01:00