Commit Graph

697 Commits

Author SHA1 Message Date
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 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
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 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
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
aiordache 50792c4621 Add Kubernetes backend
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-01-20 16:55:08 +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
Guillaume Tardif dcd1e30f6a Fix protos target to update new protos folder
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-19 16:48:54 +01:00
Nicolas De loof ed67111b3d
Merge pull request #1155 from docker/remove_example_backend 2021-01-19 11:55:19 +01:00
Guillaume Tardif aca816d5d6 Remove example backend.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-19 11:29:48 +01: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 907ba0c03e Removed unit tests (using example context) that are in fact duplicates of e2e tests in test/e2e
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 17:28:46 +01:00
Guillaume Tardif 2a8c24e4ff Move config => api/config
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 16:55:10 +01:00
Guillaume Tardif f1ac6d4fdc Move errdefs => api/errdefs
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 16:54:18 +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
Guillaume Tardif deb7bc34e0 Move protos => cli/server/
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 15:49:44 +01:00
Guillaume Tardif cd10d8eaa4 Move server => cli
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 15:32:21 +01:00
Guillaume Tardif 65f53dff43 move metrics => cli
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-15 15:26:35 +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
Guillaume Tardif 1939047fe6 Add backend-metadata command (hidden) for CLI backend
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-01-05 16:36:51 +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 53ee1418af Do not change root flags for all commands
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 f55823b70f Make Moby command detection (based on help output) more robust. It seems some tabs have been replaced by spaces in CLI 20.10. Covered with e2e test TestUnsupportedCommand.
We need to install docker CLI ourselves in Github actions nodes.

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2020-12-15 12:32:13 +01:00
Nicolas De Loof 7a2e041524
Parse --version and forward to docker/cli
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-12-14 15:16:22 +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 4270f383a7
Merge pull request #988 from docker/feat-platform
Add platform when running containers
2020-12-02 13:24:07 +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
Djordje Lukic 1148ed8837 Add platform when running containers
Signed-off-by: Djordje Lukic <djordje.lukic@docker.com>
2020-11-30 11:51:46 +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
Ulysses Souza fe566d24e6 Bump `azure-sdk-for-go`: v43.3.0 -> v48.2.0
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-11-24 11:48:26 -03:00
Nicolas De loof 38d2dd9b41
Merge pull request #907 from docker/aci_healthcheck_threshold 2020-11-17 13:35:01 +01:00
Guillaume Tardif bc966daf34
Merge pull request #912 from docker/compose-api
Compose api
2020-11-17 09:51:13 +01:00
Guillaume Tardif 5abc68ebdd Add compose service, run `compose up` through API
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-16 12:11:52 +01:00
Guillaume Tardif 575307d8af Fix run default value for health check retries
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-13 14:14:41 +01:00
Guillaume Tardif 0ef42f7bcb Fix converting run health check options
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-13 11:49:44 +01:00
Guillaume Tardif 91e5d178d2 Fix ports & Host config not being initialised in inspect view, fix E2E tests
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-12 18:00:22 +01:00
Ulysses Souza 49759af15c Add container inspect view
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-11-12 17:16:54 +01:00
Guillaume Tardif cfa090459b Move list of run specific flags where it’s used
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-06 15:38:50 +01:00
Guillaume Tardif 5c04e84e49
Merge pull request #882 from docker/yaml
Marshall cloudformation template as yaml
2020-11-06 13:51:12 +01:00
Ulysses Souza f6509ac814 Add Healthchecks to ACI
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-11-06 12:21:12 +01:00
Ulysses Souza 7aee922b35 Remap restart policies for command run
This adds 'no' and 'always' as options.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-11-06 10:37:53 +01:00
Guillaume Tardif 66a1263342 No specific case for windows, always resolve binary name before executing command
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-05 17:38:03 +01:00
Guillaume Tardif 41a1553dab No specific case for windows, always resolve binary name before executing command
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-05 17:31:26 +01:00
Guillaume Tardif 3936826673 Keep original license in windows lp_windows.go
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-05 17:12:03 +01:00
guillaume.tardif 4489f39e5d duplicate windows os/exec.LookPath() and do not resolve files in current working dir if CWD is not explicitly in PATH.
Signed-off-by: guillaume.tardif <guillaume.tardif@gmail.com>
2020-11-05 16:43:17 +01:00
Nicolas De loof c6fc0e116f
Merge pull request #879 from docker/acceskey_file
Flag to import access key & secret from file
2020-11-05 14:08:51 +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
Nicolas De Loof 44c58e7806
Flag to import access key & secret from file
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-11-04 17:20:10 +01:00
Guillaume Tardif db7d04db79 Remove obsolete flag `--json` (that was marked hidden), kept for VSCode extension but is not used, `docker context ls --format “{{ json . }}”` is used.
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-11-04 14:54:01 +01:00
Nicolas De loof f66123b34a
Merge pull request #846 from docker/ecs_context 2020-11-03 11:38:06 +01:00
aiordache 3066a1cdad cleanup
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-30 18:50:56 +01:00
Chris Crone 25e6a18fef backend: Add --rm support to local backend
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-10-30 18:19:02 +01:00
aiordache de0be8650e Remove region from contexts and cleanup
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-30 17:51:16 +01:00
Guillaume Tardif c3cc54316b This new field Named “Type” breaks VSCode extension for some strange reason, lets rename it ContextType
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-30 13:32:13 +01:00
Guillaume Tardif 7cc3bc3870 No breaking change on `docker context ls —format “{{ json . }}` , this is used by VSCode extension
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-30 10:37:36 +01:00
Guillaume Tardif b604ba6246 Fix 2 corner cases with PATH settings
* windows PATH should use windows separator (;)
* do not add separator if initial PATH is empty (was creating PATH=:/path)

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-29 15:35:22 +01:00
Guillaume Tardif 5e809acd87 Use OS-dependant pathListSeparator, when appending to PATH
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-29 15:09:38 +01:00
aiordache 53efa312c8 Refactor context create options
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-29 10:25:23 +01:00
aiordache 2dcd1a5826 refactor ecs context creation
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-29 10:10:00 +01:00
Guillaume Tardif 02501407de Add update command for backward compatibility
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-28 14:26:32 +01:00
Ulysses Souza 69083e07e6 Add --rm to run command (as not yet implemented)
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-27 01:57:35 +01:00
Ulysses Souza 29ba42bbc4 Fix volume create cli bug
This passes the pointer to the concrete struct instead of a copy

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-20 19:34:06 +02:00
Nicolas De Loof de96a0c1d0
CLI command to manage ECS volumes
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2020-10-20 16:52:50 +02:00
aiordache 8f31ad59be Refactor secrets
- create secrets from files
  - update Secret structure

Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-19 11:33:55 +02:00
Guillaume Tardif 85c94a2f7f Replace `docker run —envFile` with `docker run —env-file`
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-16 18:03:47 +02:00
Anca Iordache 05295b5e8a
Merge pull request #765 from docker/ecs_default_profile
Populate ~/.aws/config(credentials) on ecs context create
2020-10-16 11:33:03 +02:00
aiordache c2af0a136a Populate ~/.aws/config(credentials) on ecs context create
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-10-15 20:26:38 +02:00
Guillaume Tardif 50a2ae1100 Display summary of reclaimed ACI resources (CPU/mem) in `docker prune`
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-15 15:45:48 +02:00
Guillaume Tardif a5e34323e2 Add `docker prune` command and ACI implementation
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-14 17:48:11 +02:00
Ulysses Souza 660c7bbdcf Add command "volume inspect"
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-14 11:11:55 +02: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
Nicolas De loof a067882b6d
Merge pull request #734 from docker/add-version-in-user-agent
Add version to UserAgent on  ACI
2020-10-12 11:11:55 +02:00