Joffrey F
3654f3ac48
Fix oneOf validator parser to correctly process uniqueItems errors
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-26 17:21:31 -07:00
Joffrey F
fc426e273d
Merge extra_hosts instead of overwrite
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-01 13:18:44 -07:00
Joffrey F
ec1f6c36eb
Add support for extension fields in v2.x and v3.4
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:38:32 -07:00
Joffrey F
40c05cfc1e
Add --no-start flag to up command. Deprecate create command.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:36:13 -07:00
Cecile Tonglet
ebbf48e606
Actually test there is no control characters
...
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-24 14:10:50 -07:00
aronahl
390ba801a3
Fix exit code 0 upon parallel pull failure.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2017-08-15 13:48:41 -07:00
Joffrey F
7210fdb21c
Add support for start_period in healthcheck config
...
Improve merging strategy for healthcheck configs
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 16:49:29 -07:00
Joffrey F
22d9a258f4
v2 custom volume name support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
Joffrey F
8c30971299
Add support for v3.4 files and custom volume names
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
Joffrey F
3fbfb3a5dd
Prevent null logging options in `docker-compose config` output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 12:21:27 -07:00
Joffrey F
dc6bb7020d
UCP 2.2.0 test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 11:08:20 -07:00
Joffrey F
6e802df809
Add support for blkio config keys
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:45:22 -07:00
Joffrey F
454b063fed
Keep no-ansi parameter in the CLI scope
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:00:23 -07:00
Cecile Tonglet
b0b671dbf2
Add a flag --no-ansi to remove control characters on parallel executions
...
Signed-off-by: Cecile Tonglet <cecile.tonglet@gmail.com>
2017-08-09 19:00:23 -07:00
Joffrey F
3ea8a20cfa
Fix ServiceExtendsResolver same-file detection
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:06 -07:00
Joffrey F
0c4fc93895
Use newer versions of pre-commit hooks
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-02 20:02:26 -07:00
Joffrey F
d668fd1c67
Bump 1.15.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:20:09 -07:00
Joffrey F
8102f02cfc
0 is a valid value for a published port
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:17:26 -07:00
Joffrey F
7abae9f536
Escape dollar sign in serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:16:55 -07:00
Joffrey F
9502408ff0
Fix test issues with Engine 17.07 RC1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 17:33:02 -07:00
Yong Wen Chua
1ecf51c209
Add `target` to service build configuration
...
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
Yong Wen Chua
4a65008199
Add Compose v2.3
...
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
Joffrey F
6a4adb64f9
Some more test adjustments for Swarm support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-20 16:39:03 -07:00
Joffrey F
8f0ef26a73
Improved version comparisons throughout the codebase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-11 17:40:53 -07:00
Joffrey F
d94fa5428e
Make sure y/n values are quoted in serialized output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 15:15:12 -07:00
Joffrey F
e33041582f
Add "network" field to build configuration
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 12:17:46 -07:00
Joffrey F
55bd02f303
`scale` property should be merged according to standard scalar rules
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-05 13:10:50 -07:00
Joffrey F
2b7ed24bc0
Fix override volume merging + add acceptance test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 17:24:32 -07:00
Evan Shaw
9cdbb953ba
Align status output for parallel_execute
...
Previously docker-compose would output lines that looked like:
Starting service ... done
Starting short ...
Starting service-with-a-long-name ... done
It's difficult to scan down this output and get an idea of what's happening.
Now the statuses are aligned, and output looks like this:
Starting service ... done
Starting short ...
Starting service-with-a-long-name ... done
To me, this is quite a bit easier to read.
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-07-03 16:24:07 -07:00
Joffrey F
259b96748c
Add support for service:name pid config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 16:15:20 -07:00
Joffrey F
515526f0ff
Ignore test failures in storage_opt test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:51:21 -07:00
dinesh
4dd54b83e8
Add storage_opt in v2.1
...
Signed-off-by: dinesh <dineshpy07@gmail.com>
2017-06-27 12:51:21 -07:00
Joffrey F
f2054f1a7d
Fix ports sorting on Python 3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:50:41 -07:00
Joffrey F
7a4c328c41
Rewriting tests to be UCP/Swarm compatible
...
- Event may contain more information in some cases.
Don't assume order or format
- Don't assume ports are always exposed on 0.0.0.0 by default
- Absence of HostConfig in a create payload sometimes causes an error at the
engine level
- In Swarm, volume names are prefixed by "<node_name>/"
- When testing against Swarm, the default network driver is overlay
- Ensure custom test networks are always attachable
- Handle Swarm network names
- Some params moved to host config in recent (1.21+) version
- Conditional test skips for Swarm environments
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-14 16:17:15 -07:00
Joel Barciauskas
e9b6cc23fc
Add --quiet parameter to docker-compose pull, using existing silent flag
...
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-06-14 14:53:13 -07:00
Joffrey F
f3c1c8d158
ServicePort merge_field should account for external IP and protocol
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-12 11:42:29 -07:00
Joffrey F
8512b33e24
Remedy test failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
Joffrey F
bd8d77feae
Add configs tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
Joffrey F
36af86b9b2
Always convert port values in ServicePort to integer
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-05 15:51:22 -07:00
Joffrey F
9a70db0889
Merge pull request #4864 from shin-/cred_spec_support
...
Add partial support for v3.3 credential_spec
2017-05-25 17:30:44 -07:00
Joffrey F
73d7865da8
Add partial support (docker-compose config and warnings) for v3.3 credential_spec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-25 14:54:46 -07:00
Joffrey F
bf8498c488
Merge pull request #4861 from shin-/4825-cache-from
...
Merge all fields inside build dict
2017-05-25 14:44:56 -07:00
Joffrey F
347a7a8d2a
Merge pull request #4862 from shin-/network_labels_check_warn
...
Network label mismatch now prints a warning instead of raising an error
2017-05-25 14:44:36 -07:00
Joffrey F
49605f2715
Add support for build labels in 2.1 and 2.2 format
...
Add cache_from in 2.2 format
Add integration test for build labels
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:53:06 -07:00
Joffrey F
2ba9cd73d1
Network label mismatch now prints a warning instead of raising an error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:26:17 -07:00
Joffrey F
062812e4aa
Merge all fields inside build dict
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:23:04 -07:00
Joffrey F
972fe65830
Merge pull request #4860 from shin-/4845-rm-stop
...
Fix improper use of project.stop
2017-05-23 15:08:13 -07:00
Joffrey F
98419ba2a2
Merge pull request #4859 from shin-/eliat123-4771-fix-allow-override-yaml-extension
...
Fix: allow override yaml extension
2017-05-23 15:08:00 -07:00
Joffrey F
244209814b
Fix improper use of project.stop
...
Add some better test coverage for rm --stop
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 12:38:54 -07:00
Eli Atzaba
0d0c0454e9
Raise exception when override.yaml & override.yml coexist
...
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00