Commit Graph

216 Commits

Author SHA1 Message Date
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 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
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 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
Ulysses Souza 0529415fa7 Stop project on Ctrl+C
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-01-20 10:02:59 -03:00
Nicolas De Loof ed18cefc04
Introduce --env-file
fixes #1152

Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-19 11:07:13 +01:00
Nicolas De Loof e4682a0565
run "down" using project if it was set for command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-18 10:43:52 +01:00
Guillaume Tardif fe39267e3a Move formatter => cli/formatter. Needed to move formatter.MemBytes => utils.MemBytes (helper class on memory display)
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 16:47:30 +01:00
Guillaume Tardif 0ea97920c1 Move Context & context/store => api/context & api/context/store
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 16:31:59 +01:00
Guillaume Tardif 930ae8bdb2 goimports -local github.com/docker/compose-cli -w . ; gofmt -s -w .
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 16:24:00 +01:00
Guillaume Tardif 4dee783aba Move progress => api
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 15:57:24 +01:00
Nicolas De Loof 4de01936f8
introduce --remove-orphans option
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-06 14:36:59 +01:00
Ulysses Souza cef7a2d4ce Refactor ProjectName
This separate project name and service name for command `run`

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-01-04 14:11:54 +00:00
Nicolas De Loof daacc872c1
Add support for .env file when loading compose files
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-01-04 09:56:09 +01:00
Guillaume Tardif 32d5644937 Pass reader Writer as options to backend, remove hardcoded os.Stdout
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 10:01:06 +01:00
Guillaume Tardif bad0d41d90 Auto-remove using container config
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 10:00:19 +01:00
Guillaume Tardif 76f36a69c6 Reusing existing Create() and Start() API
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 10:00:18 +01:00
Guillaume Tardif 8259604074 Simplify command setup
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 09:59:02 +01:00
Guillaume Tardif 7bed2343e6 Remove not implemented options
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 09:59:02 +01:00
Guillaume Tardif 370781e95e Support option —workingdir, -f, no need to check backend support, unimplemented error is returned by backbends.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 09:59:02 +01:00
Guillaume Tardif 215f50166a Remove comment
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-18 09:59:02 +01:00
aiordache 412385c495 Add `compose run` command
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-12-18 09:58:55 +01:00
Nicolas De Loof eda6a59379
introduce options struct in the API
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-17 11:10:57 +01:00
Nicolas De Loof 855a879a6a
Introduce `removeOrphans` to cleanup injected AWS simulation container
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-17 10:46:17 +01:00
Nicolas De Loof db5467ce22
Use local compose implementation for local ecs simulation context
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-17 10:46:16 +01:00
Nicolas De Loof 056dfb95bc
allow to collect logs for a subset of project services
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-17 10:32:46 +01:00
Guillaume Tardif cf378834e5 No rebuild on compose up if image already exists by default, added first use of compose pull_policy and `compose up --build` to allow to force rebuild.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-10 18:38:16 +01:00
Guillaume Tardif cf0e10a431 Adding short description to improve help on compose subcommands
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-10 15:43:20 +01:00
Nicolas De Loof 446008a4b6
on ACI container ID is `project_service` and name is `service`
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-09 14:39:10 +01:00
Nicolas De Loof 1d859dc807
`Ps` return ContainerSummary, not Services
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-09 10:33:51 +01:00
Guillaume Tardif 04cdd8dd40 Display compose experimental disclaimer only for local context type or moby (default) context type. Fixes ACI / ECS e2e tests.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 16:37:14 +01:00
Guillaume Tardif 5c13bafac5 Add a disclaimer message for all `docker compose` commands
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 15:46:32 +01:00
Nicolas De loof 576aa46d21
Merge pull request #1015 from docker/logConsumer
Revisit logs/up API to pass a LogConsumer vs io.Writer
2020-12-07 14:57:43 +01:00
Nicolas De Loof ca123e08eb
Revisit logs/up API to pass a LogConsumer vs io.Writer
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-07 14:47:44 +01:00
Guillaume Tardif ec5afcfd4d `compose up` and other compose commands running on “Moby” context type.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-07 14:41:27 +01:00
Nicolas De Loof 136d09e1ac
split `Up` into `Create`+`Start` so logs don't collide with progress
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-04 08:16:50 +01:00
Nicolas De Loof 39e4107e12
attach to log stream by default on `up`
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-03 16:51:00 +01:00
Djordje Lukic 2f09b634cc Implement `docker compose pull`
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-12-03 16:14:38 +01:00
Ulysses Souza 7e4cfc0e3b Add order to down command
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-12-02 13:51:11 +01:00
Guillaume Tardif 5258e3d56e Add compose build flags for file and working dir
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-02 10:35:28 +01:00
Nicolas De Loof 52574046f0
introduce `compose push` command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-01 14:55:52 +01:00
Nicolas De Loof 5952183eca
introduce `compose build` command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-11-30 12:43:38 +01:00
Nicolas De Loof b1a4dfd659
filter compose project to remove all services not required by command
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-11-30 10:46:11 +01:00
Nicolas De Loof cb02622318
Marshall cloudformation template as yaml
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-11-05 11:01:32 +01:00
Ulysses Souza 6c1ea32dae Add --quiet for some commands
- compose ls
- compose ps
- secret ls // Not implemented on ACI so no e2e-aci tests
- volume ls

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-12 11:34:27 +02:00
aiordache 265dd197c3 Add detach flag to `compose up`
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-07 15:51:43 +02:00
aiordache c15d05f7f4 refactor task failure detection
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-05 19:37:13 +02:00
aiordache d3effd2ead Detect task failures
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-05 16:55:35 +02:00
Ulysses Souza 83f21b9293 Remove unused files
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Ulysses Souza 6c883dc4a5 Print only the information present in pretty on json
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Ulysses Souza 0f6f547214 Refactor Print method for lists
This also fixes in the case of nil list

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Ulysses Souza 8961805412 Add json output format to several commands
- docker context ls
- docker ps
- docker compose ls
- docker compose ps
- docker secret ls
- docker volume ls
- docker version

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Guillaume Tardif cf3bb18c0e User compose.service.domainname rather than custom ACI extension for ACI DNSLabelName
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-09-22 14:44:22 +02:00
Guillaume Tardif 334ebf5f75 Implement --domainname flag on compose up, also defining compose extension "x-aci-domain-name" to store ACI DNSLabelName.
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-09-22 14:41:31 +02:00
Chris Crone d154c41586 Update copyright
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-09-22 12:13:00 +02:00
Guillaume Tardif 267b267201 Progress functions can return a string, that can be used in the caller of progress.Run to display final result after progress display
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-09-14 14:29:03 +02:00
Guillaume Tardif 64a28f6636 Also move client => api/client
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-09-07 13:23:06 +02:00
aiordache 02be463fd7 Add `compose ls` command for ECS
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-09-04 13:20:11 +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 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 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
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 bff1fa1872
Merge pull request #525 from docker/workingdir
workdir default value is defined by compose file
2020-08-21 10:22:31 +02:00
Nicolas De Loof 838937c907
workdir default value is defined by compose file
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-08-20 15:18:03 +02:00
Djordje Lukic 635ecd7b99 Return a default implementation when nil
Some backends can decide not to implement a whole set of APIs (compose
for example), we now return a default implementation that returns a
`errdefs.ErrNotImplemented` for each action making it easy for the cli
to print a helpful error message. We also remove any possible nil
panics.

Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-08-20 14:32:03 +02:00
aiordache 6657dd2774 Add error message for aws context
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-19 18:22:07 +02:00
aiordache 44b2b8b21d integrate functionality from ecs-plugin
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-19 17:49:21 +02:00
aiordache fe0cc0d2cc Add progress.Run to down cmd
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-19 16:19:21 +02:00
Nicolas De Loof ec4615ae57
Apply linter recommendations
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-08-19 08:16:19 +02:00
Nicolas De Loof cfbd963c3d
Adjust commands to latest compose-go
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-08-18 10:01:32 +02:00
Nicolas De Loof e02d8d549b
Make ECS integration a compose-cli backend
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-08-17 21:30:49 +02:00
aiordache 00f17534a3 error check
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-06 18:13:17 +02:00
aiordache 64c517f375 remove unused parameter
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-06 18:13:17 +02:00
aiordache 46e58a28d0 Add ps and logs to compose API
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-06 18:13:17 +02:00
aiordache 42a5dfc0d2 rename runCompose() to checkComposeSupport()
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-06 12:02:11 +02:00
aiordache bb3500d77b check with client if context is supported (has a backend)
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-06 11:49:54 +02:00
aiordache 648f0139df add e2e test for compose up on default context
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-29 17:33:23 +02:00
aiordache 5a26b25709 handle compose on all context types
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-07-29 11:58:09 +02:00
Nicolas De Loof 622402709a
Use compose-go's Project and ProjectOptions
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-07-02 16:05:45 +02:00
Guillaume Tardif 90914603ba Add ACI detach flags, not used at the moment, but more makes new command more compatible with previous ones. 2020-06-23 16:17:02 +02:00
Djordje Lukic ad72c866cc Add license headers 2020-06-18 16:48:03 +02:00
Djordje Lukic a1bb04ebe1 Refactor calling the progress writer to make it easier 2020-06-18 12:10:36 +02:00
Djordje Lukic b55267739a Azure backend reports progress 2020-06-18 11:01:33 +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
Djordje Lukic 15fb6f63c3 Add licenses 2020-05-15 09:14:52 +02:00
Djordje Lukic 0765b08309 Put each compose command in own file 2020-05-15 09:14:51 +02:00
Guillaume Tardif 9a2ec752b5 Add ACI compose basic e2e test 2020-05-06 15:56:47 +02:00
Ulysses Souza e075df6f8f Fix linter issues
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-05-05 16:27:22 +02:00
Ulysses Souza ba455916c6 Refactor on services
This refactors the interfaces and implementations of
services

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-05-05 15:37:12 +02:00
Ulysses Souza 03e418cbbb Add compose up and down
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-05-05 14:03:14 +02:00