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
Joffrey F
Joffrey F
Matthieu Nottale
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