tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,226 Commits 20 Branches 267 Tags 58 MiB
Commit Graph

511 Commits

Author SHA1 Message Date
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 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 from aiordache/kube_context_create 
Refactor kubernetes context create
 2021-01-26 17:09:03 +01:00
Guillaume Tardif 3f474143ad
Merge pull request 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 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 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 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 

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 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 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 from docker/aci_healthcheck_threshold 2020-11-17 13:35:01 +01:00
Guillaume Tardif bc966daf34
Merge pull request 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 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 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 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