a1ac289943
Add label config validation, fixes #4904
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-30 11:57:42 -06:00
bee6046043
Add config validation for service volumes, fixes #5352
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-30 10:21:27 -06:00
415fa6c59b
Use mounts for secrets instead of volumes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-29 12:21:56 -08:00
58dcfac853
Merge pull request #5397 from sethktaylor11/4937-Labels
...
Added a label option to 'docker-compose run' and test.
2017-11-29 11:42:24 -08:00
c36a2fb1ad
Added a label option to 'docker-compose run' and test.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-11-28 18:43:00 -06:00
3b81e49c66
implement --timeout flag for docker-compose down
...
Fix #3370
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-11-22 16:31:16 -06:00
21e312e402
Implement --filter flag for docker-compose config --services.
...
Fix #1498
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2017-11-17 17:43:12 -06:00
badd4d764a
Refactor subnet cidr validator & add new test
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-13 21:53:14 -06:00
6c8184d0d0
Add format to other v3 configs & remove unix dependency
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-10 18:04:11 -06:00
68c636d728
Fix subnet config test for windows
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-09 23:41:42 -06:00
5691b8241d
Implement subnet config validation ( fixes #4552 )
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2017-11-09 22:30:10 -06:00
d48002a09d
Merge pull request #5361 from docker/5282-build-extra-hosts
...
Add support for extra_hosts in build config
2017-11-09 16:30:35 -08:00
c5408f3a40
Add support for extra_hosts in build config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-09 14:57:24 -08:00
0079ac52c6
Merge pull request #5250 from garribas/4801-progress-markers
...
Progress markers are not shown correctly for docker-compose up (fixes…
2017-11-09 14:29:34 -08:00
4563d8c050
Fix service label parsing
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-03 13:51:49 -07:00
819be19f7c
Miscellaneous test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 15:18:28 -07:00
0e4bd32a65
Added unit test and used stop_timeout
...
Signed-off-by: Andy Neff <andyneff@users.noreply.github.com>
2017-11-01 13:30:49 -07:00
da32c44bce
Terminate containers on SIGHUP ( fixes #4909 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-11-01 12:15:00 -03:00
80503da476
Add support for oom_kill_disable in service config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-25 17:32:18 -07:00
b30cb77a7b
docker-compose exec doesn't have -e option ( fixes #4551 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-25 13:22:00 -07:00
8c0b03a2f5
Add support for BOM-signed env files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-24 12:52:54 -07:00
aa1fb67495
Wrong format in the healthcheck test does not issue a warning ( fixes #4424 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-23 14:50:22 -07:00
a07dee9207
Add type converter to interpolation module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-23 12:42:42 -07:00
eebc63c216
Allow empty default values in variable interpolation ( fixes #5185 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-20 13:45:47 -07:00
9c5347bd23
Placing dots in hostname no longer populates domainname if api >= 1.23 ( fixes #4128 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-19 16:31:18 -07:00
803d5352e6
Add missing test constraint
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-18 17:27:23 -07:00
d2cbf33412
Add specific handling for pywintypes.error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 13:43:57 -07:00
aaa0773b4b
Config command generates invalid volumes ( fixes #5176 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 12:06:04 -07:00
7df1b53ad2
Move build labels parsing to config module
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-16 11:56:36 -07:00
57eb1c463f
Progress markers are not shown correctly for docker-compose up ( fixes #4801 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-13 22:54:39 -03:00
6de646d3b0
Build labels option: array form produces unmarshal error ( fixes #5183 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-13 22:49:41 -03:00
08714ef796
Add get_secret_volumes unit tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 17:43:07 -07:00
53e0378379
Mount with same container path and different mode should override
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 17:04:42 -07:00
aab0891a07
Temporary xfails for engine bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 16:21:34 -07:00
dc838067fd
Add shm_size to build-options (issue #3866 )
...
* Add shm_size to build configuration
* Make it possible to enlarge/customize shm size during build
* Value in bytes, or use string like "512M" or "1G" ...
* Add to compose format 2.3 and (provisionally) >=3.5 format
* Add automated test for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Made unit tests compatible with previously added shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Also support shm_size build-opt when conf override
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Automated test for shm_size build-option
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Schema 3.4, add shm_size to schema 2.3, updated const.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Corrected typo in config_schema_v3.4
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Add support for g/m/k units for shm_size in build-opts
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
Reorder imports in service.py
Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
2017-09-29 15:50:17 -07:00
9430e5bf9d
Avoid import ConfigurationError inside compose.utils (circular import)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-28 16:51:03 -07:00
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
fc426e273d
Merge extra_hosts instead of overwrite
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-09-01 13:18:44 -07:00
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
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
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
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
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
22d9a258f4
v2 custom volume name support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
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
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
dc6bb7020d
UCP 2.2.0 test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 11:08:20 -07:00
6e802df809
Add support for blkio config keys
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:45:22 -07:00
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
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
3ea8a20cfa
Fix ServiceExtendsResolver same-file detection
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-03 12:06:06 -07:00
0c4fc93895
Use newer versions of pre-commit hooks
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-02 20:02:26 -07:00
d668fd1c67
Bump 1.15.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:20:09 -07:00
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
7abae9f536
Escape dollar sign in serialized config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 18:16:55 -07:00
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
1ecf51c209
Add `target` to service build configuration
...
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
4a65008199
Add Compose v2.3
...
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2017-07-20 17:06:59 -07:00
6a4adb64f9
Some more test adjustments for Swarm support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-20 16:39:03 -07:00
8f0ef26a73
Improved version comparisons throughout the codebase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-11 17:40:53 -07:00
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
e33041582f
Add "network" field to build configuration
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-06 12:17:46 -07:00
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
2b7ed24bc0
Fix override volume merging + add acceptance test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 17:24:32 -07:00
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
259b96748c
Add support for service:name pid config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 16:15:20 -07:00
515526f0ff
Ignore test failures in storage_opt test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:51:21 -07:00
4dd54b83e8
Add storage_opt in v2.1
...
Signed-off-by: dinesh <dineshpy07@gmail.com>
2017-06-27 12:51:21 -07:00
f2054f1a7d
Fix ports sorting on Python 3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:50:41 -07:00
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
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
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
8512b33e24
Remedy test failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
bd8d77feae
Add configs tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
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
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
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
bf8498c488
Merge pull request #4861 from shin-/4825-cache-from
...
Merge all fields inside build dict
2017-05-25 14:44:56 -07:00
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
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
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
062812e4aa
Merge all fields inside build dict
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:23:04 -07:00
972fe65830
Merge pull request #4860 from shin-/4845-rm-stop
...
Fix improper use of project.stop
2017-05-23 15:08:13 -07:00
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
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
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
9334f29898
Fix for yaml extention does not work with override file
...
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00
fa77856c86
Add 3.3 format support
...
Remove build.labels field from 3.2 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 12:04:24 -07:00
9d78258b44
Fix test type
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
37de55865b
Add tests for the labels
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
7fca689efd
Update tests to show labels set to None
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
bffdb7a349
service_test.py reorder imports
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 16:42:43 +03:00
61ed6ca8a4
skip cpu_percent test for Linux
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 16:18:28 +03:00
3e39aa0709
Fix testcases.py formatting
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 15:21:35 +03:00
0043dc4fab
Add cpu_count, cpu_percent, cpus parameters.
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 14:50:29 +03:00
59a4f554b9
Prevent dependencies rescaling when executing `docker-compose run`
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-12 17:39:56 -07:00
babd7530c3
New network config whitelist option in unit test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-05 11:40:50 -07:00
3e66c68f9f
Fix external secrets serialization
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-01 14:42:17 -07:00
fd699c5923
Merge pull request #4742 from shin-/2496-new_scale
...
docker-compose up --scale, scale in config file
2017-04-27 15:52:31 -07:00
d0acefd450
Prevent NoneType error when remote IPAM options is None
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-26 13:34:45 -07:00
a0cf0a2009
Avoid rebinding tmpfs data volumes when recreating containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-25 15:10:57 -07:00
2ba4e5e8ec
Prevent `docker-compose scale` to be used with a v2.2 config file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-21 11:42:18 -07:00
afb2b6c51c
Properly relay errors in execute_convergence_plan
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-18 12:53:43 -07:00
78ee612333
Implement --scale option on up command, allow scale config in v2.2 format
...
docker-compose scale modified to reuse code between up and scale
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-17 19:51:48 -07:00
c817dedef7
Repair bad imports
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-14 14:31:30 -07:00
ae2cc6b5b8
Merge pull request #4721 from shin-/4376-unicode_file_paths
...
Convert paths to unicode in get_config_path_from_options if needed
2017-04-12 14:41:44 -07:00
1891b2b78c
Fix ServicePort.legacy_repr bug for `ext_ip::target` notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-11 14:45:14 -07:00
0f00aa4098
Convert paths to unicode in get_config_path_from_options if needed
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 17:45:06 -07:00
94defc159a
Merge pull request #4716 from shin-/4415-init_init_path
...
Add support for service.init
2017-04-10 14:42:18 -07:00
d0d684f03d
Merge pull request #4715 from shin-/4708-ipam_options
...
Add support for IPAM options in v2 format
2017-04-10 14:40:44 -07:00
843a0d82a0
Add support for IPAM options in v2 format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 12:24:05 -07:00
cc966a7e19
Add support for init and init_path
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 12:16:57 -07:00
72a2ea9d86
Fix serializer bug (python 3)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-07 16:54:31 -07:00
2506b72508
Merge pull request #4649 from shin-/bump_docker_py
...
Bump docker SDK dependency
2017-03-31 14:40:49 -07:00
48831a8d5f
Bump docker SDK dependency
...
Update invalid ports test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:15:34 -07:00
0e5acfa16c
Merge deploy key in service dicts
...
Update merge_service_dicts() to merge deploy mappings.
Compose file version 3 added the deploy key to service dicts
to specify configs related to Docker services.
Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-24 15:03:53 -06:00
eab1ee0eaf
Support 'nocopy' mode for expanded volume syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:17:23 -07:00
0d1608c17c
Merge pull request #4662 from shin-/4651-tls-version-commandline
...
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
2017-03-23 15:16:03 -07:00
f55c9d4201
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 17:27:11 -07:00
a0add5cc12
Fix ports reparsing for service extends
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 15:14:13 -07:00
732bf52a4e
The interval is too damn small
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 14:09:50 -07:00
611f058cde
Merge pull request #4632 from shin-/expanded-mounts
...
Add support for expanded mount/volume notation
2017-03-21 12:36:41 -07:00
69d0c0e3a0
Add support for expanded mount/volume notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 20:42:59 -07:00
0464476f08
Add unit test for image digests in config
...
Add two unit tests to validate that the denormalize_service_dict
function still works without passing a third argument for image_digest,
and correctly uses an image digest if one is provided.
Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:22:40 -06:00
2acf286ed6
Support V3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-15 11:40:31 -04:00
a182300706
Merge pull request #4605 from shin-/4600-check-all-network-updates
...
Ensure network config matches remote for all properties
2017-03-14 13:56:43 -07:00
a6db78e5d4
Enable variable substitution in config.secrets
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 18:30:37 -07:00
963b672cbd
Ensure network config matches remote for all properties
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 15:48:38 -07:00
23b873c2ce
Add "secrets" section to docker-compose config output when applicable
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-10 14:32:55 -08:00
dd294ce9cc
Merge pull request #4591 from shin-/4580-log-api-error
...
Avoid encoding crash in log_api_error
2017-03-10 14:02:44 -08:00
beedceb66b
Merge pull request #4589 from shin-/dbonev-2586-specify-cwd-parameter
...
Ability to change working directory via a CLI flag
2017-03-09 15:44:27 -08:00
4e92b5bb85
Merge pull request #4590 from shin-/3474-self-referencing-ext-links
...
Prevent service to create a container if it is referencing itself in an external link
2017-03-09 15:36:48 -08:00
c3bcd59aeb
Avoid encoding crash in log_api_error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 15:23:13 -08:00
5ea9167334
Prevent service to create a container if it is referencing itself in an external link
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 18:29:09 -08:00
707210ae95
Ability to change working directory via a CLI flag
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2017-03-08 14:42:14 -08:00
ac12ab95c4
Rename COMPOSE_FILE_SEPARATOR -> COMPOSE_PATH_SEPARATOR
...
Add unit test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 14:30:15 -08:00
d5a2d37d05
Properly resolve build args against host environment values
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-07 18:13:11 -08:00
449dcc9d7b
support --build-arg for build command
...
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
2017-03-07 17:09:35 -08:00
dd4e49ef98
Merge pull request #4563 from shin-/3723-mem-reservation
...
Add mem_reservation option to service config in 2.0 and 2.1 formats
2017-03-07 15:23:22 -08:00
e344fe9a9f
Merge pull request #4566 from shin-/eddwardo-run-v
...
Add --volumes flag to docker-compose run
2017-03-07 15:22:51 -08:00
01fa147183
Merge pull request #4040 from rawkode/feature/allow-running-containers-to-be-deleted
...
Allowing running containers to be rm'd by stop flag
2017-03-06 18:34:19 -08:00
0167aba2b7
Merge pull request #4541 from shin-/4502-expanded-port-syntax
...
Add support for expanded port syntax in 3.1 format
2017-03-06 18:32:52 -08:00
d75726db21
Merge pull request #4561 from shin-/JesusTinoco-3501-add-image-command-option
...
Add images command
2017-03-06 18:28:34 -08:00
4dca6adeb1
Merge pull request #4562 from shin-/lindt-bugfix/unnamed_volumes_do_not_support_mode_suffix
...
Do not add mode to anonymous volumes in config output
2017-03-06 18:21:36 -08:00
ec252350ae
Add mem_reservation option to service config in 2.0 and 2.1 formats
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:21:03 -08:00
bf7c2bc0f8
Use create_host_file in run -v tests to ensure file availability
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:13:16 -08:00
b454268f93
Merge pull request #4565 from shin-/onorua-pids-limit
...
Add pids_limit to service config
2017-03-06 18:09:53 -08:00
8f8678987b
Improve readability of code and output for the images command
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 15:56:41 -08:00
83728d2bcc
Do not add mode in volume representation if it's not a host binding
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:43:29 -08:00
b6fb3f2634
pids_limit not yet supported for swarm services - removing from v3 format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:32:04 -08:00
7512dccaa8
Add dns_opt to 2.1 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 13:28:52 -08:00
c7b8278e78
Implemented dns_opt
...
Signed-off-by: George Lester <glester491@gmail.com>
2017-03-03 15:37:21 -08:00
83388ec31a
enable -v flag for docker-compose run command
...
Give user ability to attach volumes while running containers with
docker-compose run command. Example is given in the test implementation,
command is compatible with the one provided by docker engine.
Signed-off-by: Piotr Szymanski <skyleton@gmail.com>
2017-03-02 16:50:24 -08:00
6a151aac04
introducing pids_limit, fix for #4178
...
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
2017-03-02 16:44:26 -08:00
11329e779b
added failing test that ensures that named volume will not be printed with a mode suffix
...
Signed-off-by: stefan <think@hotmail.de>
2017-03-02 15:26:40 -08:00
90beeaf21c
3501 - Remove a test and fix other
...
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00
33f510b340
3501 - Add a new command option (images)
...
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00
6986a994a8
Merge branch 'forward-exit' of https://github.com/TheClimateCorporation/compose into TheClimateCorporation-forward-exit
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 18:04:48 -08:00
b4f4ff1a6b
Merge pull request #4555 from kbh2o/abort_abort
...
Return exit code when exiting with --abort-on-container-exit
2017-03-01 17:51:58 -08:00
8d3c8be7d9
Merge pull request #4036 from nbarbey/master
...
Fix TypeError : unorderable types: str() < int()
2017-03-01 17:25:21 -08:00
6c3641fdb7
Returing 1 when a container exits with a non-zero exit code with --abort-on-container-exit is set. Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
...
Catching the first container to exit Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Addressing feedback and fixing tests Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Adding break and removing extra fixture files Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Moving break Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
2017-03-01 17:08:26 -08:00
1a77a7fd44
Merge pull request #3756 from nkovacs/2419-run-rm-volumes
...
Remove anonymous volumes when using run --rm.
2017-03-01 16:38:46 -08:00
eca3146c9c
Merge pull request #3617 from dguo/help-nonexistent-command
...
Handle giving help a nonexistent command
2017-03-01 16:31:37 -08:00
9f8e01fa94
Merge pull request #3543 from milin/master
...
Replace assertEquals with assertEqual in unittests since the former is getting dep…
2017-03-01 16:27:36 -08:00
9e90b6e645
Merge pull request #4553 from edsrzf/config-volumes
...
Add --volumes flag to config command
2017-03-01 14:54:46 -08:00
5ff3037aa8
Merge pull request #4428 from edsrzf/parallel-pull
...
Pull services in parallel
2017-03-01 14:38:22 -08:00
d67261f26e
Add --volumes flag to config command
...
Closes #3609
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-03-02 10:03:31 +13:00
11788ef0ff
Add support for expanded port syntax in 3.1 format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 12:10:51 -08:00
1f9fb27456
Allowing running containers to be rm'd by stop flag
...
Signed-off-by: David McKay <david@rawkode.com>
2017-03-01 10:33:23 +00:00
cffb76d4d9
Address comments
...
- set flag name to `--exit-code-from` (and rename some variable,
function and test names to match)
- force cascade_stop to true when exit-code-from flag is set
- use lambda in filter statement
- check that selected container name is in the project before running
- remove fancy parsing of service name to container mappings: if there
are multiple containers in a service, return the first nonzero exit
value if any
- flake8 changes
Signed-off-by: Nathan J. Mehl <n@climate.com>
2017-02-27 09:51:03 -08:00
a73190e1cc
Add support for returning the exit value of a specific container
...
Current best practice for using docker-compose as a tool for continuous
integration requires fragile shell pipelines to query the exit status
of composed containers, e.g.:
http://stackoverflow.com/questions/29568352/using-docker-compose-with-ci-how-to-deal-with-exit-codes-and-daemonized-linked
http://blog.ministryofprogramming.com/docker-compose-and-exit-codes/
This PR adds a `--forward-exitval <container>` flag that allows
`docker-compose up` to return the exit value of a specified container.
The container may optionally have a number specified (foo_2) otherwise
the first is defaulted to.
Signed-off-by: Nathan J. Mehl <n@climate.com>
2017-02-27 08:37:11 -08:00
7e8dcc847b
Merge pull request #4529 from shin-/3528-invalid-service-name
...
Detect the service that causes the invalid service name error
2017-02-24 17:47:41 -08:00
e29e3f8da4
Test for parallel_execute with limit
...
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-02-25 13:14:58 +13:00
05aa8c7285
Add optional limit to the number of parallel operations
...
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-02-24 21:53:38 +13:00
8b92049432
Detect the service that causes the invalid service name error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-22 16:21:23 -08:00
c64f7dde04
Fix failing unit tests
...
Signed-off-by: Joey Payne <jyapayne@gmail.com>
2017-02-21 19:01:30 -07:00
33fcfca040
Add test for cache_from
...
Signed-off-by: Joey Payne <jyapayne@gmail.com>
2017-02-21 19:01:30 -07:00
d20e3f3342
function-name-modification for tests/*
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-02-16 15:25:20 +08:00
abce83ef25
Fix `config` command output with service.secrets section
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 16:51:50 -08:00
dc5b3f3b3e
Fix secrets config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-10 17:11:24 -05:00
c092fa37de
Fix version 3.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-09 12:39:57 -05:00
951497c0f2
Merge pull request #4419 from shin-/4418-healthcheck-extends
...
Don't re-parse healthcheck values coming from extended services
2017-02-03 12:24:53 -08:00
e22164ec9f
Merge pull request #4035 from urda/urda/compose-top
...
Added `top` to `docker-compose` to display running processes
2017-02-02 15:41:14 -08:00
cf43e6edf7
Don't re-parse healthcheck values coming from extended services
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-02 14:50:53 -08:00
7e8958e6ca
Add missing comma in DOCKER_CONFIG_KEYS list
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-01 16:40:43 -08:00
a67500ee57
Added `top` to `docker-compose` to display running processes.
...
This commit allows `docker-compose` to access `top` for containers
much like running `docker top` directly on a given container.
This commit includes:
* `docker-compose` CLI changes to expose `top`
* Completions for `bash` and `zsh`
* Required testing for the new `top` command
Signed-off-by: Peter Urda <peter.urda@gmail.com>
2017-02-01 15:42:30 -08:00
59d1847d9b
Fix some test failures.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:40 -05:00
4053adc7d3
Add an integration test for secrets using bind mounts.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:16 -05:00
e0c6397999
Implement secrets using bind mounts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:16 -05:00
e10d1140b9
Convert time data back to string values when serializing config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 11:59:22 -08:00
9a0962dacb
Merge pull request #4361 from shin-/4348-serialize-ext-volumes
...
Remove external_name from volume def in config output
2017-01-19 17:41:08 -08:00
d83d31889e
Remove external_name from volume def in config output
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 16:05:13 -08:00
5c2165eaaf
Fix volume definition in v3 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-19 15:41:31 -08:00
1a02121ab5
depends_on merge now retains condition information when present
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-18 17:52:03 -08:00
56a1b02aac
Catch healthcheck exceptions in parallel_execute
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-17 13:22:16 -08:00
2df31bb13c
Provide valid serialization of depends_on when format is not 2.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-11 16:25:40 -08:00
534b4ed820
Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 15:45:11 -08:00
8145429399
Unify healthcheck spec definition in v2 and v3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 13:14:23 -08:00
bef2308530
Fix condition name in config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
04394b1d0a
Expand depends_on to allow different conditions (service_start, service_healthy)
...
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
ba47fb99ba
Add default labels to networks and volumes created by Compose
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-19 20:43:35 -08:00
e6b2949edc
Merge pull request #4216 from lawliet89/userns_mode
...
Implement `userns_mode` HostConfig for services
2016-12-19 18:12:15 -08:00
fb165d9c15
Add v3_only marker to healthcheck test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-16 12:21:59 -08:00
04e5925a23
Use docker SDK 2.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-14 15:36:08 -08:00
635a281777
Merge pull request #4163 from aanand/add-healthcheck
...
Implement 'healthcheck' option
2016-12-14 15:35:05 -08:00
e04a12b5ca
Increase minimum version for v3.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-12-07 11:16:40 -05:00
62f8b1402e
Implement `userns_mode` HostConfig for services
...
Fixes #3349
This allows the key `userns_mode` to be used in service definitions.
Since `userns_mode` requires API version > 1.23, this is only available
in 2.1 and 3.0 versions of compose file
Signed-off-by: Yong Wen Chua <me@yongwen.xyz>
2016-12-05 14:25:56 +08:00
fbcc1510cc
Handle giving help a nonexistent command
...
The CLI would show an unhandled exception when running:
$ docker-compose help foobar
Now, it lists the commands.
Signed-off-by: Danny Guo <dannyguo91@gmail.com>
2016-12-03 14:58:15 -05:00
716a6baa59
Implement 'healthcheck' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-18 14:47:02 +00:00
079c95c340
Use stop grace period for container stop.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:12:28 -05:00
6cac48c056
Add a vendored and modified pytimeparse
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-11-16 12:10:32 -05:00
d717c88b6e
Support version 3.0 of the Compose file format
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:07:02 +00:00
721bf89447
Merge pull request #4134 from shin-/fix_none_opts_network_check
...
Avoid breaking when remote driver options are null
2016-11-15 15:01:24 -08:00
09540339e0
Merge pull request #4131 from aanand/test-environment-overrides-env-file
...
Test that values in 'environment' override env files
2016-11-15 14:18:54 -08:00
7f60ff5ae6
Avoid breaking when remote driver options are null.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-15 12:00:52 -08:00
efb4ed1b9e
Handle new pull failures behavior in Engine 1.13
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-15 11:30:52 -08:00
ba249e5179
Test that values in 'environment' override env files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-09 15:10:27 +00:00
10417eebd7
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 17:22:31 -07:00
ba43d08fbd
Add whitelisted driver option added by the overlay driver to avoid breakage
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-01 11:47:12 -07:00
8b5782ba9f
Merge pull request #4067 from shin-/portable-find-exe
...
Replace "which" calls with the portable find_executable function
2016-10-24 16:15:21 -07:00
60d005b055
Improve robustness of a couple integration tests with occasional failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:58:45 -07:00
d2fb146913
Replace "which" calls with the portable find_executable function
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-24 13:22:52 -07:00
efb09af271
Do not normalize volume paths on Windows by default
...
Add environment variable to enable normalization if needed.
Do not normalize internal paths
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-18 12:17:56 -07:00
086ae04b9e
Fix TypeError : unorderable types: str() < int()
...
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.
The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).
Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
2016-10-18 12:01:00 +02:00
14716bc2da
Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master
2016-10-17 14:09:09 -07:00
a5c1e4b0cd
Merge pull request #3991 from shin-/3906-isolation-config
...
Add support for "isolation" in config
2016-10-17 11:02:11 -07:00
95c6cc0420
Merge pull request #3994 from shin-/3430-enable-ipv6
...
Add support for enable_ipv6 in network definition.
2016-10-17 11:02:00 -07:00
22d91f60be
fix serialize restart spec with null string
...
Signed-off-by: realityone <realityone@me.com>
2016-10-14 18:20:55 +08:00
bdcce13f4a
add support for creating volume and network with label definition
...
Signed-off-by: dbdd <wangtong2712@gmail.com>
2016-10-12 10:35:14 +08:00
e4bb9bde30
Merge pull request #3964 from shin-/3963-unicode-env
...
Don't break when interpolating environment with unicode characters
2016-10-11 12:00:36 -07:00
7f1606545d
Merge pull request #4004 from shin-/4000-extend-logging
...
Properly merge logging dictionaries in overriding configs
2016-10-11 12:00:06 -07:00
0603b445e2
Properly merge logging dictionaries in overriding configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-10 15:39:05 -07:00
9248298a4a
Merge pull request #4016 from shin-/4008-unicode-formatter
...
Handle formatter case where logrecord message is binary containing unicode
2016-10-06 16:49:03 -07:00
bc3ed6dead
Merge pull request #3992 from shin-/3701-npipe-windows-default
...
Use docker-py's default behavior when no explicit host on Windows
2016-10-06 16:48:35 -07:00
e5ded6ff9b
Add support for enable_ipv6 in network definition.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:49:08 -07:00
17c5b45641
Handle formatter case where logrecord message is binary containing
...
unicode characters.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-06 15:39:47 -07:00
2bce81508e
Support non-alphanumeric default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-10-06 17:04:19 -04:00
fe08be698d
Support inline default values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-09-29 12:46:11 -04:00
007cf96452
Use docker-py's default behavior when no explicit host on Windows
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:36:57 -07:00
dc8a39f70d
Add support for "isolation" in config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:31:58 -07:00
f65f89ad8c
Merge pull request #3653 from shin-/3637-link-local-ips
...
Add support for link-local IPs in service.networks definition
2016-09-22 11:58:29 -07:00
53fa44c01e
Don't break when interpolating environment with unicode characters
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 18:05:59 -07:00
7687412e03
Merge pull request #3922 from shin-/3897-volumespec_parse_win32
...
Improve volumespec parsing on windows platforms
2016-09-20 13:09:37 -07:00
33424189d4
Denormalize function defaults to latest version
...
Minor docs fix
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 11:47:14 -07:00
7911659266
Improve volumespec parsing on windows platforms
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-20 11:24:24 -07:00
1648a3e257
Merge pull request #3709 from Knetic/groupadd
...
Supported group_add
2016-09-19 17:18:06 -07:00
64517e31fc
Force default host on windows to the default TCP host (instead of npipe)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-16 11:43:25 -07:00
66b395d950
Include docker-py link-local fix and improve integration test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:55:42 -07:00
fd254caa68
Add support for link-local IPs in service.networks definition
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:55:14 -07:00
651283eef9
Merge pull request #3941 from shin-/3888-recover-apierror-logs
...
Catch APIError while printing container logs
2016-09-13 12:58:40 -07:00
Drew Romanyk
Joffrey F
Joffrey F
Samantha Miller
Madeline Stager
Svyatoslav Ilinskiy
Andy Neff
Guillermo Arribas
Marc van den Hoogen
Cecile Tonglet
aronahl
Yong Wen Chua
Evan Shaw
dinesh
Joel Barciauskas
Eli Atzaba
Colin Hebert
Alexey Rokhin
King Chung Huang
Daniel Nephin
Dimitar Bonev
Dat Tran
George Lester
Piotr Szymanski
Yaroslav Molochko
stefan
Jesus Tinoco
kbroadwater
David McKay
Nathan J. Mehl
Joey Payne
Aaron.L.Xu
Peter Urda
Danny Guo
Aanand Prasad
Nicolas Barbey
realityone
dbdd