tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,626 Commits 25 Branches 265 Tags 67 MiB
Commit Graph

4626 Commits

Author SHA1 Message Date
Ian Glen Neal 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
Joffrey F 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
Ian Glen Neal 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
Joffrey F 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
Joffrey F b2cc8a290a
Merge pull request #5585 from docker/nginth-4904-label-config-validation 
Labels validation and basic type conversion
 2018-01-19 14:14:07 -08:00
Joffrey F 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
Joffrey F f4d7d32280 Update CLI version in test-running Dockerfiles 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-18 12:22:52 -08:00
Joffrey F dcaef15b34 Use CLI for interactive exec on all platforms by default 
Add environment setting to enable old behavior (UNIX only)

Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-18 12:22:52 -08:00
Joffrey F 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
Joffrey F 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
Joffrey F 98044349a4
Merge pull request #5560 from docker/5371-force-windows-volume-parsing 
Add environment variable to force windows parsing style of volume paths
 2018-01-17 12:01:47 -08:00
Joffrey F 250eed61a3
Merge pull request #5579 from albers/completion-ps--services 
Add bash completion for `ps --services --filter`
 2018-01-16 14:12:34 -08:00
Joffrey F 045122c6f8
Merge pull request #5576 from tvanro/patch-1 
Fix small typo: bulid -> build
 2018-01-16 14:10:57 -08:00
Harald Albers 748357f665 Remove duplicate `--filter` from help message for `ps` 
The `--filter` option appears twice in the help message.
Its presence in the usage line suggests that it is valid for both ps and
service mode, which is wrong.

Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-16 14:32:35 +01:00
Harald Albers 6f48f5db4c Add bash completion for `ps --services --filter` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2018-01-16 14:31:28 +01:00
Tom Van Rompaey ab173472b4 Fix small typo: bulid -> build 
Signed-off-by: Tom Van Rompaey <tom.vanrompaey@it-consultis.com>
 2018-01-15 17:26:27 +08:00
Joffrey F 7f22744658
Merge pull request #5566 from docker/mhank-5042-network-priorities 
Add support for network priority
 2018-01-12 14:40:17 -08:00
Joffrey F a7ca2d8c5f Merge branch 'thomascrha-patch-1' 2018-01-12 13:58:09 -08:00
Joffrey F 97da2cc6bb Add test for NoSuchService with unicode characters 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-12 13:57:40 -08:00
Thomas a7ed1dcbf6 Fix unicode error - python2 
If the name of a container doesn't exist and its name isn't utf-8 encoded you receive a stacktrace

Signed-off-by: Thomas <thomas@9bitbyte.com>
 2018-01-13 06:52:09 +11:00
Joffrey F 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
Zal Daroga 4839baf877 Fixed python34 comparison issue 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Zal Daroga 55ee95b6d0 Fixed network priorities. Resolves #5042 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Zal Daroga f50e1a8c2d Added prioritization of networks 
Signed-off-by: Zal Daroga <zaldaroga@yahoo.com>
 2018-01-11 17:29:29 -08:00
Joffrey F 9aa9758819
Merge pull request #5565 from docker/5310-revert-5435 
Revert -d/--timeout exclusion
 2018-01-11 13:57:04 -08:00
Joffrey F b2d4d9f2bc
Merge pull request #5558 from docker/5554-tmpfs-mount-3.2 
Support legacy tmpfs mounts
 2018-01-11 12:38:38 -08:00
Joffrey F e174c3fd1c Revert -d/--timeout exclusion 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-11 12:37:46 -08:00
Joffrey F 2fbec60c9c Add environment variable to force windows parsing style of volume paths 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-10 17:11:32 -08:00
Joffrey F ac34a8302b
Merge pull request #5561 from docker/5036-remove-roadmap 
Remove outdated roadmap document
 2018-01-10 17:09:28 -08:00
Joffrey F dfba255e52 Remove outdated roadmap document 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-10 17:06:22 -08:00
Joffrey F 61c3cd5453
Merge pull request #5552 from shin-/5549-unicode-serialize 
Fix unicode errors in interpolation / serialization
 2018-01-10 12:37:05 -08:00
Joffrey F 397aa20dfc Support legacy tmpfs mounts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-10 12:16:59 -08:00
Joffrey F 39d535c1f5 Fix unicode errors in interpolation / serialization 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-09 17:05:12 -08:00
Joffrey F 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
Svyatoslav Ilinskiy 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
Joffrey F 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
Svyatoslav Ilinskiy 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
Joffrey F e400c05de0 Support ${VAR:?err} syntax for mandatory variables 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-05 16:46:09 -08:00
Joffrey F 65004e9b11
Merge pull request #5541 from docker/nginth-3397-depends-on-restart 
Fix depends_on recreation behavior
 2018-01-05 16:19:11 -08:00
Drew Romanyk c63ad67e9c Convert to use any for finding stopped containers 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:16 -08:00
Drew Romanyk 5db3cd60d4 Reword & Optimize getting stopped containers & update tests 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:16 -08:00
Drew Romanyk ba0b3d421c Fix depends on restart behavior, fixes #3397 
Signed-off-by: Drew Romanyk <drewiswaycool@gmail.com>
 2018-01-05 15:49:03 -08:00
Joffrey F 353ebe9337
Merge pull request #4992 from johnharris85/3573-ignore-orphan-warning 
Add --ignore-orphan-warning
 2018-01-05 15:29:22 -08:00
John Harris 963b004749 Add COMPOSE_IGNORE_ORPHANS 
Signed-off-by: John Harris <john@johnharris.io>
 2018-01-04 17:46:11 -08:00
Joffrey F 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
Joffrey F b13ec16e11 Replace unittest-style asserts with pytest asserts 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 14:38:28 -08:00
Joffrey F b97b76d24f
Merge pull request #5537 from docker/Rozelette-branch_limit_test 
Add configurable parallel operations limit
 2018-01-04 13:04:27 -08:00
Joffrey F ddbc9e30b0 Merge branch 'cuckoohello-5360-add-runtime-support' 2018-01-04 12:46:26 -08:00
Joffrey F 74f616f208 Fix if_runtime_available decorator 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2018-01-04 12:45:31 -08:00
Joffrey F 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