Commit Graph

26 Commits

Author SHA1 Message Date
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
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 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
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 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 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
Chris Crone d154c41586 Update copyright
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-09-22 12:13:00 +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
Chris Crone 4c6280b0e9 Rename docker/api -> docker/compose-cli
Signed-off-by: Chris Crone <christopher.crone@docker.com>
2020-08-21 17:28:39 +02:00
aiordache d1b8bcb2c7 fix signal passing to mobycli
Signed-off-by: aiordache <anca.iordache@docker.com>
2020-08-05 15:05:32 +02:00
Guillaume Tardif ab39310771 Allow --format on docker context ls. Fixing VS Code extension shellout 2020-06-23 13:25:43 +02:00
Djordje Lukic ad72c866cc Add license headers 2020-06-18 16:48:03 +02:00
Ulysses Souza f6aad0d7b4 Add --json option to commands
- docker ps
- docker context ls

Signed-off-by: Ulysses Souza <ulyssessouza@gmail.com>
2020-06-17 10:00:42 +02:00
Guillaume Tardif 2a49c3b32f added -q flag to `docker context ls`. (This is now used in desktop e2e wsl2 tests)
See https://ci-next.docker.com/teams-desktop/blue/organizations/jenkins/desktop%2Fdesktop-test-single-branch-win/detail/desktop-test-single-branch-win/274982/pipeline/
2020-06-17 07:40:27 +02:00
Guillaume Tardif d0b2bfbf52 Fix `docker context ls` that was not displaying legacy context endpoints 2020-06-15 12:10:54 +02:00
Guillaume Tardif 3c2eb067bc Fix typo in DOCKER ENPOINT 2020-06-12 14:50:35 +02:00
Guillaume Tardif e7682682fb Store context type in metadata to make retrocompatibility with previous contexts easier (potentially switching back and forth) 2020-06-10 18:17:48 +02:00
Djordje Lukic 11339761ca Change the way a context is stored
Initially we stored the context data in the `Metadata` of the context
but in hindsight this data would be better of in the `Endpoints` because
that's what it is used for.

Before:
```json
{
  "Name": "aci",
  "Metadata": {
    "Type": "aci",
    "Data": {
      "key": "value"
    }
  },
  "Endpoints": {
      "docker": {}
  }
}
```

After:
```json
{
  "Name": "aci",
  "Type": "aci",
  "Metadata": {},
  "Endpoints": {
      "aci": {
          "key": "value"
      },
      "docker": {}
  }
}
```

With this change the contexts that we create are more in line with the contexts the docker cli creates.

It also makes the code less complicated since we don't need to marsal twice any more. The API is nicer too:

```go
// Get a context:
c, err := store.Get(contextName)

// Get the stored endpoint:
var aciContext store.AciContext
if err := contextStore.GetEndpoint(currentContext, &aciContext); err != nil {
	return nil, err
}
```
2020-05-22 16:32:43 +02:00
Djordje Lukic 95e07a2134 Add default context to the context ls output 2020-05-20 18:39:10 +02:00
Djordje Lukic 0bd18986dd Add "*" for the current context 2020-05-18 16:42:06 +02:00
Djordje Lukic 15fb6f63c3 Add licenses 2020-05-15 09:14:52 +02:00
Djordje Lukic 42c72c365c Split context comands into own files 2020-05-15 09:14:51 +02:00