Commit Graph

506 Commits

Author SHA1 Message Date
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 4489d0becb Fix CI
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-23 17:23:46 +01:00
Ulysses Souza e23e9d6bcb
Merge pull request #1343 from docker/up_timeout
add --timeout option to compose up
2021-02-23 12:20:42 -03:00
Nicolas De loof 8ebbd6ea14
Merge pull request #1344 from gtardif/fix_display_up_detach
Stop displaying logs when user cancels compose up, to not mix with stop progress display
2021-02-23 15:47:28 +01:00
Guillaume Tardif 3778b664af Stop displaying logs when user cancels compose up, to not mix with stop progress display
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-23 15:13:51 +01:00
Nicolas De Loof 04edb78ab6
up --no-deps option
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-23 14:27:24 +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
Nicolas De Loof 2858911c1c
add --timeout option to compose up
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-23 14:06:28 +01: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 19af456504
Merge pull request #1340 from docker/no_build 2021-02-23 11:06:08 +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
Guillaume Tardif 98dc2308d9
Merge pull request #1339 from docker/experimental
only display experimental warning on command error
2021-02-23 10:22:45 +01:00
Nicolas De Loof 58e495c60b
only display experimental warning on command error
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-23 09:57:09 +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 189466ca81
Merge pull request #1335 from gtardif/logs_f
Allow `docker compose logs -f` for compatibility
2021-02-22 16:22:59 +01:00
Guillaume Tardif 0cffd53d5a Allow `docker compose logs -f` for compatibility
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-22 15:49:13 +01:00
Guillaume Tardif 012da2c27b Fix linter
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-22 14:57:49 +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 8525ac44ed
os ENV has precedence over env file
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-22 08:27:55 +01:00
Nicolas De loof 598f7bba1f
Merge pull request #1321 from aiordache/local_ps_services
Add `--services` flag to `compose ps`
2021-02-18 20:36:23 +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 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 28092e0c36
Merge pull request #1318 from docker/resolve-image-digests
introduce --resolve-image-digests on config command
2021-02-18 15:57:45 +01:00
Nicolas De Loof 0e862eeaa7
introduce --resolve-image-digests on config command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-18 14:48:28 +01:00
Nicolas De loof 4a5df4f8bc
Merge pull request #1317 from docker/down_remove
introduce --rmi and --volumes options
2021-02-18 14:37:19 +01:00
aiordache b11fedebdf Add `--services` flag to `compose ps`
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-02-18 13:27:53 +01:00
Nicolas De Loof 54b0cb9671
no need to override output as we bypass Fprint on quiet mode
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-18 10:06:27 +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 65fc4ffb4e
Merge pull request #1313 from docker/quiet 2021-02-17 15:24:36 +01:00
Nicolas De Loof 057f23ed75
non-tty progress write to stdout
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-17 15:23:26 +01:00
Nicolas De Loof a2d335271a introduce pull --quiet option
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-16 17:16:26 +01:00
Nicolas De Loof da7498949e introduce config --quiet
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-16 17:16:25 +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 c74cec9ae3
introduce --quiet option
close #1280

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-16 12:11:12 +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
Karol Zadora-Przylecki cc649d958c Add Azure sovereign cloud support
Signed-off-by: Karol Zadora-Przylecki <karolz@microsoft.com>
2021-02-15 18:38:59 -08:00
Nicolas De loof 9063c138ba
Merge pull request #1299 from docker/remove
introduce compose rm command
2021-02-15 15:47:50 +01: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 3f387e4e75
introduce create --force-recreate and --no-recreate
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-15 10:02:56 +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 4e5734f6e9 stop as all registered containers exited || cascadestop
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-12 17:55:38 +01:00
Nicolas De Loof 15882d3503 happy shinny linter ☜(⌒▽⌒)☞
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-02-12 17:55:38 +01:00
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 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
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
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 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
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 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 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
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 4b20d77a86 Expose `—remove-orphans` in compose down command
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-03 15:50:49 +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 628417f02d
Merge pull request #1225 from docker/kill
Add kill command
2021-02-03 11:06:06 +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
Guillaume Tardif 4fb205753a
Merge pull request #1217 from gtardif/kube_e2e
First kube e2e. Adapted context create kubernetes command to allow non interactive mode.
2021-02-02 17:17:43 +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
Guillaume Tardif 95d21fa768 First kube e2e. Adapted context create kubernetes command to allow non interactive mode.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-02-02 16:01:57 +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
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 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
Nicolas De Loof df702362a3
introduce compose create command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-29 14:50:56 +01:00
Guillaume Tardif 11950efa77 DIsplay progress of starting containers when not attaching to logs (compose up, start)
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-29 12:46:19 +01:00
Guillaume Tardif 7f3db85b11 Fix start display : do not mix logs with progress
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-29 12:23:19 +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 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 0d778fbf48
Merge pull request #1175 from aiordache/kube_context_create
Refactor kubernetes context create
2021-01-26 17:09:03 +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
Guillaume Tardif 61a3f6faa5 Keep “kubernetes” in `docker context create kubernetes mycontext` UX. We cannot use “kubernetes” as an endpoint name, because the context Marshall/unmarshall has a specific logic for the “kubernetes” endpoint, so storing “kube”
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-26 16:40:18 +01:00
aiordache 849707016b Implement kubernetes context create
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-26 16:10:57 +01:00
Guillaume Tardif 67a50b4ce6 Fixing Kube compile / lint errors
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-26 09:43:12 +01:00
Nicolas De loof dc790d542f
Merge pull request #1172 from docker/ls_filters
introduce `--filter` option on `compose ls`
2021-01-22 10:54:20 +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
Guillaume Tardif 2dc0616000
Merge pull request #1157 from aiordache/kube_backend
Add Kubernetes backend
2021-01-22 10:17:56 +01:00
aiordache 68b29f569b small fixes
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-20 16:55:08 +01:00
aiordache f291b77902 rename context to kubernetes
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-20 16:55:08 +01:00