Commit Graph

712 Commits

Author SHA1 Message Date
Guillaume Tardif adcadf0af2 Use location specifed by user if provided, and do not override with group location. ACI allow deploying in any location regardless of resource group
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-05-05 17:06:26 +02:00
Nicolas De Loof 13f37cf1c8
fix detecting active profiles implied by selected services
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-05-05 10:12:04 +02:00
Ulysses Souza 36d6c40e52 Add support for services on ps command
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-05-03 20:03:52 -03:00
Guillaume Tardif 0496f29a53 Display PATH when not finding com.docker.cli, to help debugging
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-05-03 14:55:41 +02:00
Julien Tant c2f2196d30 Add all parameter
Signed-off-by: Julien Tant <julien@craftyx.fr>
2021-05-01 19:24:07 -07:00
Julien Tant 8f9ce9d763 Add cp command
Signed-off-by: Julien Tant <julien@craftyx.fr>
2021-05-01 18:20:52 -07:00
Nicolas De loof 63057f6d1f
Merge pull request #1606 from gtardif/compose_rm_all
Add rm --all flag for backward compatibility (deprecated - no effect)
2021-04-30 13:26:56 +02:00
Chris Crone a764f8c5a8 cli.compose: Add missing \n for version
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2021-04-29 18:30:58 +02:00
Nicolas De loof b46015f2f8
Merge pull request #1610 from ndeloof/build_args_from_env 2021-04-29 12:15:35 +02:00
Nicolas De Loof 15eab93b31
docker compose exec to return command exit code
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-29 10:58:45 +02:00
Nicolas De Loof e433777796
resolve build args without value from environment
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-29 10:43:09 +02:00
Guillaume Tardif 850f81c44f Add rm --all flag for backward compatibility (deprecated - no effect)
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-28 14:37:44 +02:00
Guillaume Tardif 38b4220bdb
Merge pull request #1603 from gtardif/compose-cli-plugin-version
Separate compose CLI plugin version from Cloud integration version
2021-04-27 10:56:59 +02:00
Guillaume Tardif 28bd7bda3e Separate compose CLI plugin version from Cloud integration version
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-27 09:16:41 +02:00
Nicolas De Loof 92c9be5f87
load override sibling compose file when auto-discovered from parent dir
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-26 14:41:06 +02:00
Nicolas De Loof 9123c75142 On default context, "compose" is implemented by CLI Plugin
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-23 12:06:14 +02:00
Guillaume Tardif de3fa40bae Handle Ctrl+C for compose CLI plugin.
Could do something nicer passing the context to the compose command, rather than intercepting it and checking if it’s “.WithCancel” or not...

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-23 10:21:05 +02:00
Nicolas De Loof db38d1244c
Retrieve compose failure category by exit code
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-22 18:01:28 +02:00
Nicolas De Loof d8aa00a766 wrap compose cobra command to set exitcode according to metrics status
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-22 17:51:29 +02:00
Guillaume Tardif 1dc97e8c4b Compose as a cli plugin
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-22 17:51:29 +02:00
Nicolas De Loof 85af8cdaaa local backend to rely on dockerCli's LoadDefaultConfigFile
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-22 17:51:28 +02:00
Nicolas De Loof 0bdad7e551 pass compose.Service to cobra commands, dependency-injection style
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-22 17:50:56 +02:00
Nicolas De loof cd4a08d0d6
Merge pull request #1530 from aiordache/recreate_after_build 2021-04-20 21:05:37 +02:00
Nicolas De Loof 5cead2266d
only stop/remove selected services
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-20 19:06:41 +02:00
aiordache 31de84f547 Set image digest as service image to trigger recreation after build
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-04-20 15:15:24 +02:00
Ulysses Souza 46a7689043 Fix volume names to print simple volume names
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-04-15 16:27:58 -03:00
Guillaume Tardif d887bf7c0b
Introduce compose version command
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-15 09:18:42 +02:00
Nicolas De loof 0b968395dd
Merge pull request #1516 from docker/version_json
don't include stderr in moby exec output
2021-04-13 15:43:27 +02:00
Nicolas De Loof 4916b36b99
don't include stderr in moby exec output
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-13 15:35:26 +02:00
Chris Crone 411612ed8d Fix scan message with quiet flag
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2021-04-13 14:30:27 +02:00
Nicolas De loof 184c2b8c1a
Merge pull request #1503 from docker/metrics-failures 2021-04-13 08:37:23 +02:00
Ulysses Souza 6dbfc71a0d Fix compose config --profiles
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-04-12 00:53:50 -03:00
Guillaume Tardif 073d8e5545 Categorize failure metrics, set specific metrics for compose file parse error, file not found, cmdline syntax errors, build error, pull error.
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-09 17:20:29 +02:00
Ulysses Souza 378d02dadd Refactor `up --build`
This restarts containers which had it's images rebuilt

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-04-08 20:37:16 -03:00
Guillaume Tardif eb7732ffec
Merge pull request #1505 from aiordache/image_cmd
Add `compose images` cmd
2021-04-08 11:24:35 +02:00
Nicolas De loof d073c93ff7
Merge pull request #1509 from docker/pause_project_name
pause/unpause only need project name. use getContainers where possible
2021-04-08 10:00:16 +02:00
Nicolas De Loof 7d85485242
pause/unpause only need project name. use getContainers where possible
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-08 09:40:50 +02:00
aiordache 08055d7c7a Add `compose images` cmd
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-04-07 16:08:09 +02:00
Guillaume Tardif 86f5e311d7 Replace custom error type for exit code with existing one from docker/cli.
Will also help to move towards CLI plugin.

Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-07 15:48:37 +02:00
Guillaume Tardif 6a0269f7b9
Merge pull request #1483 from docker/windows_sucks
make windows "kill children process" code simpler
2021-04-07 10:55:22 +02:00
Nicolas De loof 74277f3496
Merge pull request #1495 from docker/no_service
deadlock waiting for services when none selected
2021-04-07 10:21:42 +02:00
Nicolas De loof bd5c188be6
Merge pull request #1494 from gtardif/cancel_docker_cli_metrics
Track cancel exit code from docker cli shellout to report correct status in metrics
2021-04-06 14:35:04 +02:00
Nicolas De loof acfdd2349b
Merge pull request #1496 from docker/compose_profiles
add support for COMPOSE_PROFILES
2021-04-06 11:55:37 +02:00
Nicolas De Loof 05958228ac
deadlock waiting for services when none selected
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-06 11:22:22 +02:00
Nicolas De Loof 2f6a636670
add support for COMPOSE_PROFILES
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-06 11:20:58 +02:00
Guillaume Tardif 6465bfec82 track cancel exit code from docker cli shellout to report correct status in metrics
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-04-06 10:19:27 +02:00
Nicolas De Loof 0cd080a786
make metrics' source configuration (see compose-switch)
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-04-01 14:42:05 +02:00
Nicolas De Loof a691cc98e7
make windows "kill children process" code simpler
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-31 15:24:50 +02:00
Nicolas De loof 9df272a893
Merge pull request #1470 from aiordache/build_args
Add `no-cache` build flag
2021-03-30 15:58:28 +02:00
Guillaume Tardif e0a828daae --memory is not deprecated, but not supported on buildkit. Issue a Warning and ignore flag
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-30 15:24:36 +02:00
Guillaume Tardif 2b1158f4c2 Adapt cli/mobycli to avoid duplicating shellout code
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-30 13:45:05 +02:00
Nicolas De loof 95d2159258
Merge pull request #1478 from docker/profiles
introduce config --profiles for parity with docker-compose
2021-03-30 12:03:59 +02:00
Nicolas De Loof 25d5367480
introduce config --profiles for parity with docker-compose
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-30 11:52:16 +02:00
Guillaume Tardif 435a51f9e4 Add scan message after docker build, add e2e tests
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-29 19:12:06 +02:00
aiordache 3f0ee7072f Add `no-cache` build flag
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-26 18:16:22 +01:00
Ulysses Souza 02744ac4f9 Add --ignore-pull-failures to command pull
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-24 14:44:04 -03:00
Nicolas De loof 9f81314124
Merge pull request #1451 from docker/down_sigterm 2021-03-22 17:18:03 +01:00
Nicolas De loof 40a24af897
Merge pull request #1445 from gtardif/ansi_flag 2021-03-22 17:08:19 +01:00
Nicolas De Loof a942ef4a81
Kill on second SIGTERM
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-22 16:56:02 +01:00
Nicolas De Loof 15b56b3e8d
--no-interpolate
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-22 10:01:34 +01:00
Guillaume Tardif 584ceab72a Fix \n not being rendered with backquotes
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-22 09:56:19 +01:00
Guillaume Tardif ffe309f595 Deprecated flag --no-ansi
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-19 17:46:25 +01:00
Guillaume Tardif 6482f7967c Added deprecated build flags parallel, compress, force-rm
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-19 17:37:08 +01:00
Guillaume Tardif 6562ec80f4
Merge pull request #1444 from docker/config_flags
introduce config --services, --volumes, --hash for backward compatibility
2021-03-19 16:57:25 +01:00
Nicolas De Loof ec5489a08c
introduce config --services, --volumes, --hash for backward compatibility
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-19 15:40:24 +01:00
Guillaume Tardif a86a4737da
Merge pull request #1438 from docker/port
introduce `port` command for parity with docker-compose
2021-03-19 15:08:09 +01:00
Guillaume Tardif 2bf3e9d1de
Merge pull request #1443 from docker/parallel
introduce --parallel  and --no-parallel (hidden, deprecated) flags
2021-03-19 15:07:05 +01:00
Guillaume Tardif e0344ea7b4
Merge pull request #1415 from ulyssessouza/add-restart
Add restart command
2021-03-19 15:04:57 +01:00
Nicolas De Loof 2acce2805b
introduce --parallel and --no-parallel (hidden, deprecated) flags for backward compatibility
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-19 14:53:15 +01:00
Nicolas De Loof 8b38874aba
introduce `port` command for parity with docker-compose
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-19 13:31:42 +01:00
Nicolas De Loof 949e8bb090
use "container name witout project" for both logs and events
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-17 11:38:43 +01:00
Ulysses Souza 2fdc3bad48 Add restart command
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-16 02:02:36 -03:00
Nicolas De Loof 48402585fd
replace passing parameters by context with singletons
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-12 15:28:17 +01:00
Guillaume Tardif 9301c298ef
Merge pull request #1390 from ulyssessouza/quiet-pull
Add `quietPull` option to `up`
2021-03-11 09:09:55 +01:00
Ulysses Souza aa4d15d28c Add `quietPull` option to `up`
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-10 11:43:53 -03:00
Nicolas De loof 3999eea066
Merge pull request #1400 from docker/tls_flags 2021-03-09 14:48:53 +01:00
Guillaume Tardif bac9fb9e05
Merge pull request #1406 from aiordache/shellout_context_cmds
Enable `context export/import` commands
2021-03-09 10:33:07 +01:00
aiordache 86b3d69c71 Forward `context export/import` to mobycli
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-09 10:29:12 +01:00
aiordache bc0611ad52 Update tests for determining current context
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-09 09:52:07 +01:00
aiordache f1f4ca4833 Check -H flags and DOCKER_HOST/DOCKER_CONTEXT vars when determining current context
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-08 19:28:16 +01:00
Nicolas De Loof 9c4d8ab158
(re)attach to container after restart
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-08 14:11:15 +01:00
Nicolas De Loof 4c592700ee introduce docker compose events
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-08 12:19:05 +01:00
aiordache 29cc59cf42 Return exit code 1 if engine error on version query
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-08 11:54:52 +01:00
Nicolas De loof f08c58f903
Merge pull request #1398 from aiordache/compose_top 2021-03-08 11:25:46 +01:00
aiordache fef479ad1f update test
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 16:30:52 +01:00
Guillaume Tardif 80822bde44
Merge pull request #1392 from docker/run_opts
implement -v, -p, --service-ports and --use-aliases on compose run
2021-03-05 14:52:08 +01:00
aiordache 6458b97089 test fix
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:48:18 +01:00
aiordache f0fd18eec9 set current context to default when -H flag is set
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:34:49 +01:00
aiordache 6f1d88e3bc Fix test and load dockerconfig in the backend
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:34:49 +01:00
aiordache d26783c322 Add connection flags to root command
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 14:34:49 +01:00
Nicolas De Loof d08255c4ff
implement -v, -p, --service-ports and --use-aliases on compose run
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-05 14:25:29 +01:00
aiordache 62f24c7086 Add `ignore-push-failures` flag to `compose push`
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 13:39:31 +01:00
aiordache 79af862613 Add `compose top` command
Signed-off-by: aiordache <anca.iordache@docker.com>
2021-03-05 12:44:16 +01:00
Anca Iordache b3025ca4fe
Merge pull request #1379 from aiordache/kube_hack
Kube backend updates from Hack days
2021-03-04 18:17:06 +01:00
Guillaume Tardif 91b39d0772
Merge pull request #1380 from docker/build_args
introduce --build-args option
2021-03-03 18:27:41 +01:00
Nicolas De Loof 08e4222fbb
introduce --build-args option
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
2021-03-03 16:44:53 +01:00
Nicolas De loof b6192f35f4
Merge pull request #1383 from ulyssessouza/attach-dependencies
Add --attach-dependencies
2021-03-03 16:22:09 +01:00
Guillaume Tardif 29df866075
Merge pull request #1388 from gtardif/aci_cloud_names_in_help
Display available azure cloud names in azure login help
2021-03-03 16:10:44 +01:00
Guillaume Tardif f08488d64d Display available azure cloud names in azure login help
Signed-off-by: Guillaume Tardif <guillaume.tardif@gmail.com>
2021-03-03 13:48:03 +01:00
Ulysses Souza 10d024428c Add --attach-dependencies
This actually makes the service selection
effective and add the flag to disable
the service selection.

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2021-03-02 22:27:34 -03:00