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

353 Commits

Author SHA1 Message Date
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
Ulysses Souza fb59c9385d Fix tests 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 0f6f547214 Refactor Print method for lists 
This also fixes in the case of nil list

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Ulysses Souza 8961805412 Add json output format to several commands 
- docker context ls
- docker ps
- docker compose ls
- docker compose ps
- docker secret ls
- docker volume ls
- docker version

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 15:41:18 +02:00
Guillaume Tardif abd6af6386
Merge pull request #704 from ulyssessouza/add-envFile 
Add envFile arguments to run command
 2020-10-01 13:55:24 +02:00
Ulysses Souza 2e899202ec Add envFile arguments to run command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-10-01 06:19:08 +02:00
Ulysses Souza 277702dc6b Add argument support to run command 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-30 15:34:22 +02:00
Guillaume Tardif b9d6c2e701 Add volume as a new served API, use `one of` in proto for context specific parameters, proxy volume creation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-28 14:56:32 +02:00
Guillaume Tardif ca35ccfb0e ACI Volumes : create takes one required arg, instead of required flag `--fileshare` (we still have required flag `--storage-account` specifically for ACI) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-24 17:10:32 +02:00
Guillaume Tardif cf3bb18c0e User compose.service.domainname rather than custom ACI extension for ACI DNSLabelName 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:44:22 +02:00
Guillaume Tardif 334ebf5f75 Implement --domainname flag on compose up, also defining compose extension "x-aci-domain-name" to store ACI DNSLabelName. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif 268c02523a Only add `--domainname` flag to `docker run` in ACI context 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif 701d1b834e ACI: allow users to set DNSLabelName and deploy containers with fqdn like `myapp.eastus.azurecontainers.io` 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-22 14:41:31 +02:00
Guillaume Tardif f42e05fcc3
Merge pull request #636 from docker/update-copyright 
Update copyright
 2020-09-22 12:21:16 +02:00
Guillaume Tardif 772493d70d
Merge pull request #617 from ulyssessouza/volumes_ro 
Add 'readOnly' capability to volumes on ACI
 2020-09-22 12:14:31 +02:00
Chris Crone d154c41586 Update copyright 
Signed-off-by: Chris Crone <christopher.crone@docker.com>
 2020-09-22 12:13:00 +02:00
Ulysses Souza 02d59ae510 Add 'readOnly' capability to volumes on ACI 
Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-18 12:07:42 +02:00
Guillaume Tardif 3ccc603461 Add status field in CLI metrics : success, failure, cancelled 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-18 10:47:50 +02:00
Guillaume Tardif 292ec55f46 Check specified subscription in context create and if not found, prompt users they might need to login with -—tenant-id. 
Cf https://github.com/docker/aci-integration-beta/issues/27

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-17 22:05:43 +02:00
Nicolas De loof 6d35a6d644
Merge pull request #609 from docker/refacto_multi_error_format 
Remove duplicated code formatting multi errors
 2020-09-15 18:14:45 +02:00
Guillaume Tardif 267b267201 Progress functions can return a string, that can be used in the caller of progress.Run to display final result after progress display 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-14 14:29:03 +02:00
Guillaume Tardif 2ce4e98d88 In version, replace “Azure integration” version info by “Cloud integration” 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-11 17:29:40 +02:00
Guillaume Tardif b85eddd09c Remove duplicated code formatting multi errors 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-11 16:08:14 +02:00
Guillaume Tardif 57ded74aee
Merge pull request #598 from docker/encode_env_values 
Properly send env variables containing “=“ in their value in ACI payload. Also properly send quoted values
 2020-09-10 17:17:02 +02:00
Guillaume Tardif 98f0064fe9 Properly send env variables containing “=“ in their value in ACI payload. Also properly send quoted values 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 17:03:34 +02:00
Guillaume Tardif 0b3fdb637d Change volume IDs from “storageaccount@fileshare“ to “storageaccount/fileshare” 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 16:07:22 +02:00
Guillaume Tardif 07547d7b87 ACI Volume create flags are required 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 15:24:51 +02:00
Guillaume Tardif 099b64935b Minor fixes 
Co-authored-by: Chris Crone <christopher.crone@docker.com>

Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 14:55:46 +02:00
Guillaume Tardif 80d23a6097 Removed NAME from `volume ls` output, allow `volume delete <ID>` using IDs from `volume ls`. 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 09:14:39 +02:00
Guillaume Tardif 38a8f5310b Volume command is only available in aci context type, with ACI specific flags 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-10 09:14:39 +02:00
Guillaume Tardif b96a6d1086 Add progress on volume creation 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 17:54:45 +02:00
Guillaume Tardif 96d785a5bd Added volume delete, can delete juste a file share or the storage account if confirmed 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 16:32:16 +02:00
Guillaume Tardif dcbc1c3fb2 Volume cli minor refactor 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 08562b403e Connecting it all 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 9ed06ece5b Adding volume API & initial CLI command 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-08 15:30:50 +02:00
Guillaume Tardif 64a28f6636 Also move client => api/client 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-07 13:23:06 +02:00
Guillaume Tardif d06aa2827f Move containers, compose, secrets to /api 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-07 13:22:08 +02:00
Guillaume Tardif f24f02bbbb
Merge pull request #581 from docker/remove_delete_alias 
Remove delete alias, no reason to add this (does not exist in Moby)
 2020-09-04 15:47:27 +02:00
Nicolas De loof a8c290fe98
Merge pull request #583 from docker/compose_ls 2020-09-04 14:13:27 +02:00
Guillaume Tardif 1a41d0a90b Remove delete alias, no reason to add this (does not exist in Moby) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-09-04 13:22:28 +02:00
aiordache 02be463fd7 Add `compose ls` command for ECS 
Signed-off-by: aiordache <anca.iordache@docker.com>
 2020-09-04 13:20:11 +02:00
Ulysses Souza 15066ce999 Add 'kill' command 
- On ACI that's implemented as a stop,
since ACI does not implement a kill

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
 2020-09-04 02:57:54 +02:00
Guillaume Tardif c7e2db077e
Merge pull request #544 from docker/simulation 
Introduce ECS emulation mode
 2020-09-01 15:18:32 +02:00
Nicolas De Loof fed50d79f2
introduce ecs-local context 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 15:30:05 +02:00
Nicolas De Loof 7f8bb030e6
Introduce ECS emulation mode 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-31 10:01:52 +02:00
Guillaume Tardif b0c50ed6dd Implement compose ps on ACI 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-28 17:43:18 +02:00
Guillaume Tardif f80e90caca
Merge pull request #529 from docker/api 
Revisit compose API so it uses compose-go Project as parameter
 2020-08-27 11:52:27 +02:00
Nicolas De Loof edb30e7e82
Revisit compose API so it uses compose-go Project as parameter 
Signed-off-by: Nicolas De Loof <nicolas.deloof@gmail.com>
 2020-08-27 10:59:20 +02:00
Guillaume Tardif ed395a1e64 Display nice message on context creation (message taken from Moby cli) 
Signed-off-by: Guillaume Tardif <guillaume.tardif@docker.com>
 2020-08-26 18:09:01 +02:00