Guest24897
/
DockerCLI
mirror of https://github.com/docker/cli.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
5,616 Commits 11 Branches 241 Tags 240 MiB
Commit Graph

41 Commits

Author SHA1 Message Date
Silvin Lubecki 3a8ef767f8 Add a doc.go file so the compose/schema/data directory can be vendored in another project, without being pruned. 
Signed-off-by: Silvin Lubecki <silvin.lubecki@docker.com>
 2018-07-02 10:08:25 +02:00
Vincent Demeester cc26da94ed Add `init` support in 3.7 schema 
> Run an init inside the container that forwards signals and reaps
  processes

This is supported on `run` and now on Swarm services too, so it's also
possible to have in on a composefile :).

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-25 11:13:32 +02:00
Vincent Demeester 2c4de4fb5e
Update tests to use gotest.tools 👼 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-06-08 18:24:26 +02:00
Vincent Demeester 6bcfa8806c
Allow `x-*` extension on 3rd level objects 
As for top-level key, any 3rd-level key which starts with `x-` will be
ignored by compose. This allows for users to:
* include additional metadata in their compose files
* create YAML anchor objects that can be re-used in other parts of the config

This matches a similar feature in the swagger spec definition:
https://swagger.io/specification/#specificationExtensions

This means a composefile like the following is valid

```
verison: "3.7"
services:
  foo:
    image: foo/bar
    x-foo: bar
network:
  bar:
    x-bar: baz
```

It concerns services, volumes, networks, configs and secrets.

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-31 13:38:58 +02:00
Vincent Demeester 4e6e5d583c
Support for rollback config in compose 3.7 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-29 11:37:51 +02:00
Vincent Demeester df6e38b81a
Add composefile schema 3.7 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2018-05-29 11:37:12 +02:00
Daniel Nephin 078cbc9c4b Convert assert.Check with 
git grep -l -P '^\s+assert\.Check\(t, ' | \
    xargs perl -pi -e 's/^(\s+assert)\.Check(\(t, (?!is).*(\.Execute\(|\.Set\(|\.Write\(|\.Close\(|\.Untar\(|\.WriteFile\(|Validate\().*\)$)/\1.NilError\2/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:43:53 -05:00
Daniel Nephin baf65a5502 Convert to assert.NilError 
Using:

  git grep -l '^\s\+assert\.Check(t, err)$' | \
    xargs sed -i -e 's/^\(\s\+assert\)\.Check(t, err)$/\1.NilError(t, err)/'

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-06 15:27:34 -05:00
Daniel Nephin 5155cda716 Post migration fixes 
Fix tests that failed when using cmp.Compare()
internal/test/testutil/assert
InDelta
Fix DeepEqual with kube metav1.Time
Convert some ErrorContains to assert

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Daniel Nephin 39c2ca57c1 Automated migration 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-03-05 19:41:17 -05:00
Joffrey F 56f26d1134
Fix typo in 3.6 schema ID 
Signed-off-by: Joffrey F <joffrey@docker.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2018-02-21 19:55:12 +01:00
Daniel Nephin b127b8d927 Replace go-bindata with esc 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2018-02-12 14:23:19 -05:00
Ethan Haynes b15362ce32 adding tmpfs field to the compose 3.6v file spec and updating binary 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-16 10:50:40 -06:00
Ethan Haynes 2b8cc52409 adding config_schema_v3.6.json and updating binary 
Signed-off-by: Ethan Haynes <ethanhaynes@alumni.harvard.edu>
 2018-01-16 10:44:08 -06:00
Joffrey F 88bbaca294 Add missing additionalProperties marker on mount definitions 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 12:37:38 -08:00
Joffrey F e49f14cf36 Add shm_size property to build configuration in Compose schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 12:34:12 -08:00
Daniel Nephin d0b8aa7701 Support network.name in the compose schema. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-12-06 10:05:24 -05:00
Renaud Gaubert 1ff73f867d Added support of Generic resources in compose file 
Signed-off-by: Renaud Gaubert <renaud.gaubert@gmail.com>
 2017-11-28 21:52:09 +01:00
Ilya Sotkov ec47003ecb Remove duplication for secrets / configs, combine 3.5 loader tests, remove extraneous error call, regenerate schema correctly 
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
 2017-11-22 13:41:16 +02:00
Ilya Sotkov 1f10b31017 Add tests for secret.name in compose files. 
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
 2017-11-22 13:18:05 +02:00
Ilya Sotkov 4f7f3d2f61 Add secret.name and config.name in compose. 
Signed-off-by: Ilya Sotkov <ilya@sotkov.com>
 2017-11-22 13:18:05 +02:00
Simon Ferquel 47cf2ea683 Add isolation mode on service update/create and compose files 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-11-17 15:31:13 +01:00
Simon Ferquel 787e30d57a Preparing for compose schema v3.5 
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com>
 2017-11-17 15:30:32 +01:00
Li Yi e02fcfd34e Change the type of interval, timeout and start_period of healthcheck from string to * time.Duration 
Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-08-30 23:39:12 +08:00
Li Yi 0abdad615f Support start_period for healthcheck in Docker Compose 
Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-08-29 11:19:29 +08:00
Daniel Nephin 2a1857e899 Allow extension fields in the v3.4 version of the compose format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-22 10:42:49 -04:00
Joffrey F 1667073908 Update schemas to prevent invalid properties in deploy.resources 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-17 15:58:51 -07:00
Daniel Nephin eef256943b Add network and target to build in v3.4 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-08-09 10:50:32 -04:00
Antonis Kalipetis 2950667f07
Support the "order" key in "update_config" for compose 
Signed-off-by: Antonis Kalipetis <akalipetis@gmail.com>
 2017-07-28 22:50:55 +03:00
Liping Xue 27a3080825 Change to enable volume name can be customized. 
Signed-off-by: Liping Xue <lipingxue@gmail.com>
Change to enable volume name can be customized.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Change to enable volume name can be customized.

Remove unused debug info.

Address comments from Daniel and solve the lint error.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to print warning message when name of external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address Daniel's comments to return error when external volume is set in loader code.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Remove the case that specifying external volume name in full-example.yml.

More fix.

Add unit test.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Daniel, move the schema change to v3.4.
Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Sebastiaan. Signed-off-by: Liping Xue <lipingxue@gmail.com>

Address comments from Misty.
Signed-off-by: Liping Xue <lipingxue@gmail.com>
 2017-07-27 15:09:05 -07:00
Daniel Nephin 0adccacb38 Add Compose format 3.4 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-07-19 14:24:59 -07:00
Brian Goff e574286ba2 Add support for configs to compose format 
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-16 17:10:14 -04:00
Sebastiaan van Stijn 4e7943646b add credential-spec to compose 
Signed-off-by: Michael Friis <friism@gmail.com>
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Brian Goff <cpuguy83@gmail.com>
 2017-05-15 15:00:26 -04:00
Sebastiaan van Stijn 131fe7dfb2 Move "labels" to compose 3.3 format 
Commit bb5dfdb8c5acd48f17498b111db360820a50baec added a
labels option to the docker-compose file format, but
added it to the 3.2 schema.

This patch moves the change to the 3.3 schema

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-11 08:30:48 +10:00
Daniel Nephin ef1d58dd87 Add check for compose bindata. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2017-05-09 15:42:22 -04:00
Li Yi b3459936db Support placement preferences in stack deployment 
Move of moby/moby#32743

Signed-off-by: Li Yi <denverdino@gmail.com>
 2017-05-09 07:00:45 +08:00
Gaetan de Villele 295140edf2 cli: gofmt + goimports 
Signed-off-by: Gaetan de Villele <gdevillele@gmail.com>
 2017-05-08 10:51:30 -07:00
Colin Hebert 9c02b38bec Regenerate schema with the correct libraries 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-03 17:46:40 -07:00
Colin Hebert 53b43f02e2 Run go generate github.com/docker/docker/cli/compose/schema 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-03 17:46:40 -07:00
Colin Hebert a2c8291e1e Add support for labels during build with compose 
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
 2017-05-03 17:46:40 -07:00
Daniel Nephin 1630fc40f8 Import docker/docker/cli 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2017-04-17 17:40:59 -04:00