876e1ba8d5
Merge pull request #5798 from mnottale/cpu-rt
...
Add support for cpu_rt_period and cpu_rt_runtime.
2018-03-19 06:51:25 -07:00
6c7c7902f1
Merge pull request #5788 from mnottale/dash-underscore-in-project-name
...
Allow dash and underscore in project name.
2018-03-19 05:33:21 -07:00
4a75fc7bbc
Merge pull request #5787 from mnottale/pull-parallel-by-default
...
Pull parallel by default
2018-03-19 05:19:32 -07:00
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
b1ade31c67
Manage encoding errors in progress_stream
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-15 17:10:36 -07:00
8336407830
pull: Deprecate '--parallel' and enable it by default.
...
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-03-15 15:47:29 +01:00
5fe3aff1c3
Allow dash and underscore in project name.
...
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-03-15 15:44:43 +01:00
0112c740ad
Check volume config against remote and error out if diverged
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-12 17:19:03 -07:00
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
85670e208b
Merge pull request #5751 from mnottale/cpu_period
...
Add support for 'cpu_period' for compose v2.1-v2.3.
2018-03-08 18:12:59 -08:00
7e3bbef436
Preserve security_opt values in extends
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-03-08 18:03:54 -08:00
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
31dcfcff2a
Revamp ParallelStreamWriter to fix display issues.
...
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-03-07 15:22:38 +01:00
38f7fdfe89
Merge pull request #5709 from mnottale/exec-workdir
...
Add '--workdir' option to 'exec'.
2018-03-02 15:28:07 -08:00
4ceeaad089
Merge pull request #5725 from docker/geigerzaehler-run-with-network-alias
...
Add --use-aliases flag to run command
2018-02-27 14:01:09 -08:00
1096a903be
unset entrypoint test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-27 13:25:52 -08:00
e78c0bf533
Add acceptance test for use-aliases feature
...
Signed-off-by: Jim Dalton <jim.dalton@gmail.com>
2018-02-27 13:13:50 -08:00
5b6e02d13a
'run' command can use network aliases for service
...
It is now possible for the 'run' command to use the network aliases
defined for the service.
Fixes #3492
Signed-off-by: Thomas Scholtes <thomas-scholtes@gmx.de>
2018-02-27 13:13:50 -08:00
9b2efd50f5
Merge pull request #5722 from docker/5700-call-docker-with-args
...
Re-use TLS and host options when shelling out to docker CLI
2018-02-27 12:27:49 -08:00
7ce5766f6a
Re-use TLS and host options when shelling out to docker CLI
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-27 11:14:28 -08:00
2578813147
Merge pull request #5706 from docker/5601-config-proxy
...
Use config file-provided proxy values to populate buildargs and env
2018-02-27 10:13:37 -08:00
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
a6c31b80fe
Add support for seccomp files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-26 10:46:10 -08:00
ec0de7eb68
Merge pull request #5684 from docker/compat_mode
...
Compatibility mode
2018-02-26 10:42:59 -08:00
5e4700b176
Add proxy_config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-23 14:32:43 -08:00
2fed399881
Add '--workdir' option to 'exec'.
...
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-02-23 16:57:23 +01:00
59b08c7d1d
New --log-level option.
...
Signed-off-by: Matthieu Nottale <matthieu.nottale@docker.com>
2018-02-23 13:14:26 +01:00
d4106679a6
Use configfile-provided proxy values to populate buildargs and env values
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-22 16:19:50 -08:00
2fa201660c
Merge pull request #5699 from docker/pantuza-cli-add-detach-option
...
Add long-form --detach CLI flag
2018-02-22 12:52:28 -08:00
c6fe564ed5
Add --detach tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-21 16:42:49 -08:00
8e268afc93
Add version guard for multi-service buildarg
...
Add buildarg tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-21 15:56:02 -08:00
cd7ccad81e
Retrieve certs from default path if not provided explicitly
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-21 13:33:27 -08:00
51076b5e12
Tests for compatibility mode
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-16 16:37:20 -08:00
64b466c0bc
Add optional argument to pull dependencies on docker-compose pull.
...
Signed-off-by: Kevin Boschert <kcboschert@gmail.com>
2018-02-14 13:11:01 -08:00
bb16d9e951
Add health string generator to match `docker ps` output
2018-02-12 12:10:05 -08:00
a6459efcad
Merge branch '4909-terminate-containers-on-sighup' of https://github.com/garribas/compose into garribas-4909-terminate-containers-on-sighup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-07 13:59:22 -08:00
c223c3fde9
Merge pull request #5625 from albers/option-consistency
...
Add missing `-q|--quiet` options to increase consistency
2018-02-07 13:54:05 -08:00
3a0ed8cbba
Modified options dict leads to a mismatched config hash for API < 1.30
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-06 16:58:15 -08:00
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
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
a0f78539b6
Test and build on 3.6 (replaces 3.4) ; dist 3.6-compiled binaries
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 16:05:32 -08:00
8725385813
Merge pull request #5631 from docker/bump_sdk
...
Bump python SDK to 3.0.0
2018-02-01 14:51:05 -08:00
4d4e066fbc
Fix DOCKER_TLS_VERIFY bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-02-01 12:16:32 -08:00
d8d484e0e1
Bump python SDK to 3.0.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-31 18:54:58 -08:00
6cfbb7ed8a
Add missing `-q|--quiet` options to increase consistency
...
Signed-off-by: Harald Albers <github@albersweb.de>
2018-01-30 01:28:15 +01:00
c5154d6b2b
Don't break during recreate when a mount target is updated
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-23 15:25:25 -08:00
b64cfd1982
Merge pull request #5596 from docker/4337-recreate-anon-volumes
...
Add up flag `--renew-anon-volumes` (shorthand -V)
2018-01-23 10:07:33 -08:00
f679f77555
Merge pull request #5598 from carlwgeorge/mock-import-fix
...
Use mock compatibility import
2018-01-23 09:55:13 -08:00
8b5d32373e
Use mock compatibility import
...
`tests/__init__.py` already has a try/except statement to use mock from
the standard library when possible. Take advantage of it like other
tests already do.
Signed-off-by: Carl George <carl@george.computer>
2018-01-22 23:10:50 -06:00
b07091ac5f
Add up flag `--renew-anon-volumes` (shorthand -V)
...
to avoid reusing the previous container's data
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-22 16:08:33 -08:00
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
fd1e8024f7
Merge pull request #5593 from docker/4651-tls-env-and-flags
...
Support mixed use of TLS flags and TLS environment variables
2018-01-22 11:01:44 -08:00
593a675d2b
Support mixed use of TLS flags and TLS environment variables
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 15:48:30 -08:00
9ba9016cbc
Improve ImageNotFound handling in convergence
...
- Improved CLI prompt
- Attempt volume preservation with new image config
- Fix container.rename_to_tmp_name()
- Integration test replicates behavior ; remove obsolete unit test
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 14:16:57 -08:00
4042121f6e
The updated unit test simulates the error in the bug. What's happening
...
is that the container has an image sha (represented by
'shaDOES_NOT_EXIST') which causes an error when client.inspect_image
is called on it, because the image has actually been removed.
Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
2018-01-19 14:16:56 -08:00
2d986dff79
Remove rebuild parameter ; set do_build instead
...
Reduce repetition in main.py
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-19 14:16:56 -08:00
7591639c72
Fix #5465 by catching a no-image exception in
...
get_container_data_volumes. The ImageNotFound exception is now bubbled
up to the client, which prompts the user on the desired course of action
(rebuild or abort). Added a case to the unit test to check that
an empty existing image doesn't result in an exception.
Closed old pull request #5466 because I did a rebase and it showed over
300 commits to merge, which I thought was messy.
Signed-off-by: Ian Glen Neal <ian.gl.neal@gmail.com>
2018-01-19 14:16:56 -08:00
5d4ccafd35
Merge pull request #5580 from docker/5578-use_cli_exec
...
Use CLI for interactive exec on all platforms by default
2018-01-19 14:15:07 -08:00
a5d8c68d42
Also use docker CLI for interactive one-off runs.
...
COMPOSE_EXEC_NO_CLI -> COMPOSE_INTERACTIVE_NO_CLI
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-18 13:28:11 -08:00
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
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
7f22744658
Merge pull request #5566 from docker/mhank-5042-network-priorities
...
Add support for network priority
2018-01-12 14:40:17 -08:00
97da2cc6bb
Add test for NoSuchService with unicode characters
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-12 13:57:40 -08:00
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
4839baf877
Fixed python34 comparison issue
...
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
2018-01-11 17:29:29 -08:00
55ee95b6d0
Fixed network priorities. Resolves #5042
...
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
2018-01-11 17:29:29 -08:00
f50e1a8c2d
Added prioritization of networks
...
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
2018-01-11 17:29:29 -08:00
9aa9758819
Merge pull request #5565 from docker/5310-revert-5435
...
Revert -d/--timeout exclusion
2018-01-11 13:57:04 -08:00
b2d4d9f2bc
Merge pull request #5558 from docker/5554-tmpfs-mount-3.2
...
Support legacy tmpfs mounts
2018-01-11 12:38:38 -08:00
e174c3fd1c
Revert -d/--timeout exclusion
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-11 12:37:46 -08:00
61c3cd5453
Merge pull request #5552 from shin-/5549-unicode-serialize
...
Fix unicode errors in interpolation / serialization
2018-01-10 12:37:05 -08:00
397aa20dfc
Support legacy tmpfs mounts
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-10 12:16:59 -08:00
39d535c1f5
Fix unicode errors in interpolation / serialization
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-09 17:05:12 -08:00
c4fda0834d
Merge pull request #5384 from ilinum/1498-docker-compose-services
...
Implement --filter flag for docker-compose config --services and use it in bash completion
2018-01-09 17:02:04 -08:00
a1f0c3ed7c
Rename `ps --filter` option from `key` to `source`.
...
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2018-01-09 10:57:06 -06:00
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
253bed497d
Allow only one `--filter` argument and simplify code
...
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2018-01-07 13:56:05 -06:00
e400c05de0
Support ${VAR:?err} syntax for mandatory variables
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-05 16:46:09 -08:00
ba0b3d421c
Fix depends on restart behavior, fixes #3397
...
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
2018-01-05 15:49:03 -08:00
963b004749
Add COMPOSE_IGNORE_ORPHANS
...
Signed-off-by: John Harris <john@johnharris.io>
2018-01-04 17:46:11 -08:00
c3b1bce42e
Merge pull request #5538 from docker/update_test_asserts
...
Replace unittest-style asserts with pytest asserts
2018-01-04 15:00:44 -08:00
b13ec16e11
Replace unittest-style asserts with pytest asserts
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-04 14:38:28 -08:00
b97b76d24f
Merge pull request #5537 from docker/Rozelette-branch_limit_test
...
Add configurable parallel operations limit
2018-01-04 13:04:27 -08:00
74f616f208
Fix if_runtime_available decorator
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-04 12:45:31 -08:00
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
8d3c7d4bce
Clean up limit setting code and add reasonable input guards
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-04 12:16:46 -08:00
d582ae0009
Merge branch 'branch_limit_test' of https://github.com/Rozelette/compose into Rozelette-branch_limit_test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2018-01-04 11:32:38 -08:00
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
0025050847
Convert mounts to legacy volumes if API version < 1.30
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-18 12:35:59 -08:00
acf76c15a2
Allow parallel limit to be set in env file.
...
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
2017-12-16 19:50:55 -06:00
dc6b464751
Do not bleed env values outside of test.
...
Signed-off-by: Ashlie Martinez <ashmrtn@utexas.edu>
2017-12-16 08:51:02 -06:00
c8ba50ff1e
Avoid CLI crash if image has no tags
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-12 15:26:20 -08:00
fffcc05a8e
Add stop_grace_period to ALLOWED_KEYS
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-11 11:03:19 -08:00
48166a79c7
Add COMPOSE_PARALLEL_LIMIT to restrict global number of parallel operations
...
Signed-off-by: Shea Rozmiarek <uberpanzermensch@gmail.com>
2017-12-10 07:02:10 -06:00
d0644bdff8
Handle non-ascii characters in npipe error handler
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-08 14:16:14 -08:00
5c0a06475c
Expand mount source when type == bind
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-07 14:10:56 -08:00
8155ddc7ad
Add support for custom names for networks, secrets, configs
...
Finalize v3.5 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 16:48:14 -08:00
771bf5f7ea
Merge pull request #5436 from docker/5244-advanced-mount-support
...
Add support for mount syntax
2017-12-05 17:16:28 -08:00
79b20eb53f
Add support for mount syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-05 16:21:49 -08:00
eabccda9d1
Merge pull request #5393 from summergirl21/3370-down-timeout
...
implement --timeout flag for docker-compose down
2017-12-05 12:32:43 -08:00
91bb682bdf
Merge pull request #5435 from summergirl21/5434-up-d-timeout-not-allowed
...
Raise error if up used with both -d and --timeout
2017-12-05 12:30:42 -08:00
16cc8437de
Raise error if up used with both -d and --timeout
...
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-05 12:28:28 -06:00
ceec0595bd
Allow port publish ranges
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-04 14:15:17 -08:00
9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory
...
Adds support for a memory build-arg in docker-compose build.
2017-12-04 14:00:09 -08:00
e4e92dd3d8
add support for `runtime` option in service definitions
...
close #5360
Signed-off-by: Yafeng Shan <cuckoo@kokonur.me>
2017-12-04 12:13:28 +08:00
a6cdd62726
Adds support for a memory flag to docker-compose build.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-03 13:59:32 -06:00
be0b902631
Add ability to list and filter services in `ps`
...
Also, rename --filter "option=..." to --filter "key=..."
Signed-off-by: Svyatoslav Ilinskiy <ilinskiy.sv@gmail.com>
2017-12-02 18:37:21 -06:00
a204e50058
Merge pull request #5415 from docker/5377-secrets-mounts
...
Use mounts for secrets instead of volumes
2017-12-01 13:25:46 -08:00
43fc651364
Merge pull request #5418 from nginth/5352-fix-volume-config
...
Add config validation for service volumes, fixes #5352
2017-12-01 12:19:23 -08:00
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
Joffrey F
Matthieu Nottale
Joffrey F
Jim Dalton
Thomas Scholtes
kcboschert
Sorawis Nilparuk
Harald Albers
Carl George
Ian Glen Neal
Zal Daroga
Svyatoslav Ilinskiy
Drew Romanyk
John Harris
Ashlie Martinez
Shea Rozmiarek
Madeline Stager
Yafeng Shan
Samantha Miller
Andy Neff
Guillermo Arribas
Marc van den Hoogen
Cecile Tonglet
aronahl
Yong Wen Chua
Evan Shaw
dinesh
Joel Barciauskas
Eli Atzaba
Colin Hebert