851eeb9639
Add support for pids limit in stacks (swarm)
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-06-18 21:25:08 +02:00
0c5f97ed72
compose: add build.extra_hosts to v3.9 schema
...
This is not currently used by the CLI, but can be used by
docker compose to bring parity on this feature with the
compose v2.4 schema.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-05-10 20:01:03 +02:00
2c0e93063b
bump gotest.tools v3.0.1 for compatibility with Go 1.14
...
full diff: https://github.com/gotestyourself/gotest.tools/compare/v2.3.0...v3.0.1
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-02-23 00:28:55 +01:00
5ad1d4d4c8
docker run: specify cgroup namespace mode with --cgroupns
...
Signed-off-by: Rob Gulewich <rgulewich@netflix.com >
2020-01-29 22:50:37 +00:00
97010520d4
bump mjibson/esc v0.2.0
...
full diff: https://github.com/mjibson/esc/compare/v0.1.0...v0.2.0
includes:
- mjibson/esc#51 Readdir Implementation - and covering with tests
- mjibson/esc#53 update go versions and golint import location
- mjibson/esc#58 Avoid unnecessary conversion and so pass with unconvert linter
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2020-01-27 17:40:56 +01:00
612d83d6df
cli: remove unnecessary newlines (whitespace)
...
```
cli/config/config_test.go:465: unnecessary trailing newline (whitespace)
}
cli/compose/interpolation/interpolation.go:56: unnecessary leading newline (whitespace)
switch value := value.(type) {
cli/compose/interpolation/interpolation.go:94: unnecessary trailing newline (whitespace)
}
cli/command/image/build/context.go:348: unnecessary trailing newline (whitespace)
}
internal/licenseutils/client_test.go:98: unnecessary leading newline (whitespace)
func (c *fakeLicensingClient) LoadLocalLicense(ctx context.Context, dclnt licensing.WrappedDockerClient) (*model.Subscription, error) {
cli/registry/client/fetcher.go:211: unnecessary leading newline (whitespace)
for _, endpoint := range endpoints {
```
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-10-31 19:22:36 +01:00
06f34ba507
bump github.com/xeipuuv/gojsonschema v1.1.0
...
full diff: https://github.com/xeipuuv/gojsonschema/compare/93e72a773fade158921402d6a24c819b48aba29d...f971f3cd73b2899de6923801c147f075263e0c50
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-10-10 23:00:43 +02:00
5bc1f24dfd
Add docker-compose schema v3.9
...
This is currently just a copy of the v3.8 schema, in preparation
of new features to be added in the new schema.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-08-30 10:58:05 +02:00
6511da877f
Add support for using Configs as CredentialSpecs in services
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-04-12 11:17:29 -05:00
89f9d806ff
Add driver and driver_opts to secret in compose schema 3.8
...
Signed-off-by: Sune Keller <absukl@almbrand.dk >
2019-04-05 12:01:21 +02:00
7764101a54
Add support for template_driver in composefiles
...
This maps the `--template-driver` flag on secret and config creation.
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-03-18 23:49:30 +01:00
70846619a9
Update compose 3.8 to disallow additional properties
...
This was added in other schemas in 1e99ed3ca3github@gone.nl >
2019-03-18 12:56:16 +01:00
cfe12f4135
Merge pull request #1410 from olljanat/replicas-max-per-node
...
Add maximum replicas per node support to stack version 3.8
2019-02-20 13:22:18 +01:00
6347ab315b
Add maximum replicas per node support to stack version 3.8
...
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com >
2019-02-19 11:25:12 +02:00
1e99ed3ca3
Disallow additional properties in credential_spec
...
Signed-off-by: Sebastiaan van Stijn <github@gone.nl >
2019-02-02 18:27:50 +01:00
1b8d1e23c5
Add compose schema version 3.8
...
Signed-off-by: Olli Janatuinen <olli.janatuinen@gmail.com >
2019-01-14 18:18:17 +02:00
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
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
2c4de4fb5e
Update tests to use gotest.tools 👼
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-06-08 18:24:26 +02:00
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
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
df6e38b81a
Add composefile schema 3.7
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm >
2018-05-29 11:37:12 +02:00
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
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
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
39c2ca57c1
Automated migration
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-03-05 19:41:17 -05:00
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
b127b8d927
Replace go-bindata with esc
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2018-02-12 14:23:19 -05:00
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
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
88bbaca294
Add missing additionalProperties marker on mount definitions
...
Signed-off-by: Joffrey F <joffrey@docker.com >
2017-12-06 12:37:38 -08:00
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
d0b8aa7701
Support network.name in the compose schema.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-12-06 10:05:24 -05:00
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
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
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
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
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
787e30d57a
Preparing for compose schema v3.5
...
Signed-off-by: Simon Ferquel <simon.ferquel@docker.com >
2017-11-17 15:30:32 +01:00
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
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
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
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
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
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
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
0adccacb38
Add Compose format 3.4
...
Signed-off-by: Daniel Nephin <dnephin@docker.com >
2017-07-19 14:24:59 -07:00
e574286ba2
Add support for configs to compose format
...
Signed-off-by: Brian Goff <cpuguy83@gmail.com >
2017-05-16 17:10:14 -04:00
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
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
Sebastiaan van Stijn
Rob Gulewich
Sune Keller
Vincent Demeester
Sebastiaan van Stijn
Olli Janatuinen
Silvin Lubecki
Daniel Nephin
Joffrey F
Ethan Haynes
Renaud Gaubert
Ilya Sotkov
Simon Ferquel
Li Yi
Li Yi
Antonis Kalipetis
Liping Xue
Brian Goff