Commit Graph

564 Commits

Author SHA1 Message Date
Joffrey F 9f9122cd95 Don't convert slashes for UNIX paths on Windows hosts
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-09-19 11:36:51 -07:00
Joffrey F 9c2ffe6384 Avoid overriding external = False in serializer
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-07-09 15:28:32 -04:00
Joffrey F 80322cfa5b Better support for UTF8+bom Compose files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-06-18 16:46:37 -07:00
Vincent Demeester c584ad67fc
Add `init` support in 3.7 schema
> Run an init inside the container that forwards signals and reaps
> processes

This is already supported in 2.4 schema

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-06-18 10:52:57 +02:00
Vincent Demeester 7a19b7548f
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 14:15:10 +02:00
Vincent Demeester 70574efd5b
Support for rollback config in compose 3.7
Ignoring it on docker-compose

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-05-30 13:36:59 +02:00
Vincent Demeester 025fb7f860
Add composefile v3.7
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2018-05-29 11:58:54 +02:00
Joffrey F f368b4846f Ignore attachable property on networks in compatibility mode
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-05-04 15:16:43 -07:00
Joffrey F 5aafa54667 iprange -> ip_range
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-05-01 17:11:14 -07:00
Joffrey F fa6d837b49 Clearly define IPAM config schema for validation
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-04-23 19:08:55 -07:00
Joffrey F 7aa51a18ff Fix port serialization with external IP
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-30 18:02:06 -07:00
Joffrey F e6420bd011 Update 2.4 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-30 12:41:19 -07:00
Joffrey F 520f5d0fde Add 2.4 file format with platform support. Also reads DOCKER_DEFAULT_PLATFORM env
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-30 12:39:10 -07:00
Joffrey F 2e100353d3 Add support for build isolation parameter
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-29 16:57:07 -07:00
Joffrey F 8d96980ba4
Merge pull request #5833 from docker/5826-load_retry_utf8
On load error, retry reading the file with UTF-8 encoding
2018-03-28 11:45:04 -07:00
Joffrey F 90c57f99e8 On load error, retry reading the file with UTF-8 encoding
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-27 12:37:21 -07:00
Joffrey F 71d40c2a9b Avoid fallthrough with empty defaults
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-27 11:10:30 -07:00
Matthieu Nottale 16ea49ac8c Add support for cpu_rt_period and cpu_rt_runtime.
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-03-19 13:18:35 +01:00
Joffrey F 867ad1550b
Merge pull request #5769 from docker/5766-fix-secopt-extend
Preserve security_opt values in extends
2018-03-08 18:20:56 -08:00
Joffrey F 7e3bbef436 Preserve security_opt values in extends
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-08 18:03:54 -08:00
Matthieu Nottale b9f9643d24 Add support for 'cpu_period' for compose v2.1-v2.3.
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-03-07 15:23:24 +01:00
Joffrey F a35335a75c Add support for device_cgroup_rules in v2.3 files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-26 14:43:44 -08:00
Joffrey F a6c31b80fe Add support for seccomp files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-26 10:46:10 -08:00
Joffrey F 51076b5e12 Tests for compatibility mode
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-16 16:37:20 -08:00
Joffrey F 8c297f267e Implement compatibility mode,
translating deploy keys to equivalent v2 config if available

Enabled using `--compatibility` CLI flag

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-05 17:31:17 -08:00
Joffrey F 9dde4fff0e Add support for 3.6 schema and tmpfs mount size
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-02 12:01:41 -08:00
Joffrey F b968d34227 Advanced merge for deploy dict in v3 files
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-22 15:05:53 -08:00
Joffrey F 7f30a88bd6 Add type conversion (number, bool) -> float for label values
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-17 18:50:27 -08:00
Joffrey F c387d05a40 Merge branch '4904-label-config-validation' of https://github.com/nginth/compose into nginth-4904-label-config-validation
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-17 18:00:11 -08:00
Joffrey F 98044349a4
Merge pull request #5560 from docker/5371-force-windows-volume-parsing
Add environment variable to force windows parsing style of volume paths
2018-01-17 12:01:47 -08:00
Joffrey F d63500a191 Move priority option to service network reference
Add ordering to networks.get_networks
Fix priority test

Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-11 18:48:56 -08:00
Zal Daroga f50e1a8c2d Added prioritization of networks
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
2018-01-11 17:29:29 -08:00
Joffrey F b2d4d9f2bc
Merge pull request #5558 from docker/5554-tmpfs-mount-3.2
Support legacy tmpfs mounts
2018-01-11 12:38:38 -08:00
Joffrey F 2fbec60c9c Add environment variable to force windows parsing style of volume paths
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-10 17:11:32 -08:00
Joffrey F 397aa20dfc Support legacy tmpfs mounts
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-10 12:16:59 -08:00
Joffrey F 39d535c1f5 Fix unicode errors in interpolation / serialization
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-09 17:05:12 -08:00
Joffrey F 1b39817172
Merge pull request #5531 from docker/5505-required-variables
Support ${VAR:?err} syntax for mandatory variables
2018-01-08 13:38:15 -08:00
Joffrey F e400c05de0 Support ${VAR:?err} syntax for mandatory variables
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-05 16:46:09 -08:00
Joffrey F f22a1b6a2e Merge branch '5360-add-runtime-support' of https://github.com/cuckoohello/compose into cuckoohello-5360-add-runtime-support
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-04 12:33:39 -08:00
Joffrey F 2d064614ac Gracefully handle errors and provide helpful error message in type conversion
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-03 14:02:05 -08:00
Joffrey F 7d628ad1ab Add stop_grace_period to ALLOWED_KEYS
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-13 13:41:38 -08:00
Joffrey F ad40a9e654 Expand mount source when type == bind
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-08 14:30:43 -08:00
Joffrey F 99e9e32d7e Add support for custom names for networks, secrets, configs
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 084818ce2b Add support for mount syntax
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Joffrey F 34ea11fcb7 Allow port publish ranges
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk dba2abd523 Add config validation for service volumes, fixes #5352
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Joffrey F 3ce2f03d70 Use mounts for secrets instead of volumes
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 17:34:46 -08:00
Samantha Miller 7835a07550 Added a label option to 'docker-compose run' and test.
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk 76e9076cb7 Refactor subnet cidr validator & add new test
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00
Drew Romanyk df0f7e17d3 Add format to other v3 configs & remove unix dependency
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-12-06 17:34:46 -08:00