Commit Graph

401 Commits

Author SHA1 Message Date
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
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 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 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 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 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
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
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
Ulysses Souza 10632b008b Add version to UserAgent on ACI
This also refactors the Version insertion to make it global

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-12 09:15:32 +02:00
Guillaume Tardif 6516632ecf Add resource reservations to container inspect
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-08 17:47:16 +02:00
Guillaume Tardif b1edfb6507 Change inspect json output to group things a bit more nicely, and more like Moby json output
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-08 17:03:30 +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
Guillaume Tardif a1bb2d5abe Allow `docker context ls —formatter {{json.}}` to not delegate to Moby and include context type in the json
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-06 18:00:35 +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
Guillaume Tardif 144c403e96
Merge pull request #721 from ahlaw/main
Normalize case of command and flag help
2020-10-05 11:45:47 +02:00
Guillaume Tardif 97576db803
Merge pull request #689 from ulyssessouza/json-out
Add json output format to several commands
2020-10-05 10:30:30 +02:00
Amos Law e10424e316 Normalize case of command and flag help
Signed-off-by: Amos Law <ahlaw.dev@gmail.com>
2020-10-03 20:43:18 -04:00
Ulysses Souza 344db70274 Fix version command on bypassing to moby cli
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-02 19:04:43 +02:00
Ulysses Souza 74e86ab06a Fix HTML escape encoding
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-02 18:53:22 +02:00
Guillaume Tardif 6d0f7f399f Fix regression: let users login to local registry (no '.' In registry name)
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
2020-10-02 13:54:59 +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 b8a1e6c888 Change JSON output to individual lines
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Ulysses Souza 3e9095a873 Fix docker context ls for retrocompatibility
It writes each context as an independent object line

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 604cf0c911 Add comment on legacy --json option
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00
Ulysses Souza 044e7f571d Remove go template from help on list commands
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-10-01 15:41:18 +02:00