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
Ian Glen Neal
Joffrey F
Joffrey F
Zal Daroga
Svyatoslav Ilinskiy
Drew Romanyk
John Harris
Ashlie Martinez
Shea Rozmiarek
Madeline Stager