e2f6f0122e
Merge pull request #4696 from docker/4694-include_3.2_format_in_binary
...
Add 3.2 schema to docker-compose.spec
2017-04-03 12:43:33 -07:00
65b919cf08
Add 3.2 schema to docker-compose.spec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-03 11:54:12 -07:00
2506b72508
Merge pull request #4649 from shin-/bump_docker_py
...
Bump docker SDK dependency
2017-03-31 14:40:49 -07:00
8f08f57cb7
Merge pull request #4683 from sdurrheimer/zsh-completion-run-volume
...
Add zsh completion for 'docker-compose run -v --volume'
2017-03-31 12:22:28 -07:00
9069ae78f7
Merge pull request #4685 from sdurrheimer/zsh-completion-config
...
Add zsh completion for 'docker-compose config --resolve-image-digests --volumes'
2017-03-30 13:46:05 -07:00
5230396543
Merge pull request #4684 from sdurrheimer/zsh-completion-build-build-arg
...
Add zsh completion for 'docker-compose build --build-arg'
2017-03-30 13:45:08 -07:00
72b1b24605
Merge pull request #4682 from sdurrheimer/zsh-completion-images
...
Add zsh completion for 'docker-compose images'
2017-03-30 13:44:42 -07:00
be8fd5810e
Add zsh completion for 'docker-compose config --resolve-image-digests --volumes'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:10:20 +02:00
29d23c2793
Add zsh completion for 'docker-compose build --build-arg'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:05:36 +02:00
9fc3cc9c3c
Add zsh completion for 'docker-compose run -v --volume'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 22:01:00 +02:00
f6fc8b5822
Add zsh completion for 'docker-compose images'
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2017-03-30 21:32:33 +02: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
79e6346732
Merge pull request #4629 from fate-grand-order/master
...
fix misspell "compatibility" in script/ci
2017-03-28 14:26:33 -07:00
98676d3fe8
Merge pull request #4666 from docker/bump-1.12.0-rc2
...
Bump 1.12.0 rc2
2017-03-27 12:07:53 -07:00
1b275b4f22
Merge pull request #4669 from ucalgary/4517-preserve-deploy-options
...
Merge deploy options in service dicts
2017-03-24 15:02:46 -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
08dc2a4152
Bump 1.12.0-rc2
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 17:53:32 -07:00
7575f40069
Ignore unicode error in subprocess call
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 17:53:32 -07:00
da466b3914
Change docker-py dependency error to a warning, update fix command
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 17:53:32 -07:00
489074ac78
Merge pull request #4652 from shin-/4569-docker-py-deps-conflict
...
Change docker-py dependency error to a warning, update fix command
2017-03-23 17:52:58 -07:00
962330120d
Ignore unicode error in subprocess call
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 16:43:15 -07:00
cd3343440c
Change docker-py dependency error to a warning, update fix command
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 16:42:50 -07:00
70d28e8cf2
Merge pull request #4661 from shin-/extended-volumes-nocopy-sypport
...
Support 'nocopy' mode for expanded volume syntax
2017-03-23 16:09:52 -07:00
747186f900
Support 'nocopy' mode for expanded volume syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
0a55b07002
Fix ports reparsing for service extends
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
6cbedb78cc
The interval is too damn small
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
14115a3570
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:22:51 -07:00
8c181b81ca
Merge remote-tracking branch 'source/release' into bump-1.12.0-rc2
2017-03-23 15:19:15 -07: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
6339440a3c
Merge pull request #4653 from shin-/4644-extends-ports
...
Fix ports reparsing for service extends
2017-03-23 15:15:33 -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
402b0157d4
Merge pull request #4659 from docker/dependency_test_increase_interval
...
The interval is too damn small
2017-03-22 15:12:27 -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
23a808e5c4
Merge pull request #4635 from docker/bump-1.12.0-rc1
...
Bump 1.12.0 RC1
2017-03-20 12:05:26 -07:00
d1a23cee85
Merge pull request #4641 from albers/completion-pull--parallel
...
Add bash completion for `pull --parallel`
2017-03-20 11:36:29 -07:00
566cd1b1e4
Merge pull request #4640 from albers/completion-up--exit-code-from
...
Fix bash completion for `up --exit-code-from`
2017-03-20 11:36:07 -07:00
d40b6c02a3
Merge pull request #4637 from albers/completion-config--new-options
...
Add bash completion for `config --resolve-image-digests|--volumes"`
2017-03-20 11:35:29 -07:00
0cf5f28f17
Add bash completion for `pull --parallel`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:37:41 +01:00
02c294ee28
Fix bash completion for `up --exit-code-from`
...
`--exit-code-from` requires an argument.
Also corrected sort order.
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-20 16:28:02 +01:00
5fdbd5026a
Add bash completion for `config --resolve-image-digests|--volumes"`
...
Signed-off-by: Harald Albers <github@albersweb.de>
2017-03-19 08:00:35 -07:00
5e0a793945
Bump 1.12.0-rc1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-18 16:48:10 -07:00
442a5f6eeb
Add support for expanded mount/volume notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-18 16:43:08 -07:00
94fea2a461
Merge remote-tracking branch 'source/release' into bump-1.12.0-rc1
2017-03-18 15:44:33 -07:00
9d2c6f156b
Merge pull request #4333 from ucalgary/4332-config-image-digests
...
Add --resolve-image-digests option to docker-compose config command
2017-03-18 15:41:43 -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
962ba5b937
Extract image tag to digest code into a function
...
Extract the code in bundle() and config() that translates image tags
into digests into a function named image_digests_for_project().
Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:23:40 -06: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
Joffrey F
Joffrey F
Steve Durrheimer
King Chung Huang
Harald Albers