tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,630 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

666 Commits

Author SHA1 Message Date
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
Nicolas De loof 0037e0755f
Merge pull request #1377 from docker/pull_deps 
introduce pull --include-deps
 2021-03-02 15:51:38 +01:00
aiordache d10600041d Add secret support 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2021-03-02 15:33:32 +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 fada87ca19
don't put enabled services in the disabled slice 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 14:25:32 +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 0a05bbc84e introduce pull --include-deps 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2021-03-02 09:28:36 +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
Ulysses Souza 98bb20f2d1 Keep --workdir at compose level for retro compatibility 
This also checks for conflicts with --project-directory
at `docker compose` command level

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2021-03-01 12:43:00 -03: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 3420df679b
Merge pull request #1255 from karolz-ms/658-azure-sovereign-clouds 
Add Azure sovereign cloud support
 2021-02-25 14:17:30 +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 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