tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-23 13:45:00 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,390 Commits 21 Branches 280 Tags
Commit Graph

3390 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Joffrey F
7aa55120db Merge pull request #4704 from shin-/update-changelog-1.12 
1.13.0dev
 2017-04-05 15:14:47 -07:00
Joffrey F
dd862b28c0 1.13.0dev 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-05 13:57:56 -07:00
Joffrey F
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
Joffrey F
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
Joffrey F
2506b72508 Merge pull request #4649 from shin-/bump_docker_py 
Bump docker SDK dependency
 2017-03-31 14:40:49 -07:00
Joffrey F
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
Joffrey F
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
Joffrey F
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
Joffrey F
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Steve Durrheimer
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
Joffrey F
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
Joffrey F
79e6346732 Merge pull request #4629 from fate-grand-order/master 
fix misspell "compatibility" in script/ci
 2017-03-28 14:26:33 -07:00
Joffrey F
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
King Chung Huang
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
Joffrey F
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
Joffrey F
962330120d Ignore unicode error in subprocess call 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-23 16:43:15 -07:00
Joffrey F
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
Joffrey F
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
Joffrey F
eab1ee0eaf Support 'nocopy' mode for expanded volume syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-23 15:17:23 -07:00
Joffrey F
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
Joffrey F
6339440a3c Merge pull request #4653 from shin-/4644-extends-ports 
Fix ports reparsing for service extends
 2017-03-23 15:15:33 -07:00
Joffrey F
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
Joffrey F
a0add5cc12 Fix ports reparsing for service extends 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 15:14:13 -07:00
Joffrey F
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
Joffrey F
732bf52a4e The interval is too damn small 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-22 14:09:50 -07:00
Joffrey F
611f058cde Merge pull request #4632 from shin-/expanded-mounts 
Add support for expanded mount/volume notation
 2017-03-21 12:36:41 -07:00
Joffrey F
d1a23cee85 Merge pull request #4641 from albers/completion-pull--parallel 
Add bash completion for `pull --parallel`
 2017-03-20 11:36:29 -07:00
Joffrey F
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
Joffrey F
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
Harald Albers
0cf5f28f17 Add bash completion for pull --parallel 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-20 16:37:41 +01:00
Harald Albers
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
Harald Albers
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
Joffrey F
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
Joffrey F
69d0c0e3a0 Add support for expanded mount/volume notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-17 20:42:59 -07:00
King Chung Huang
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
King Chung Huang
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
King Chung Huang
1da3ac4715 Add --resolve-image-digests argument to config command 
Add a --resolve-image-digests argument to the config command that pins
images to a specific image digest, just like the bundle command. This
can be used to pin images in compose files being used to deploy stacks
in Docker 1.13.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-17 12:21:28 -06:00
King Chung Huang
1a7e01c39a Add image digest arguments to config serialization 
Add arguments for image digests in the config.serialize module to
optionally pin images to digests, like bundles.

Signed-off-by: King Chung Huang <kinghuang@mac.com>
 2017-03-17 12:19:13 -06:00
fate-grand-order
8471276e73 fix misspell "compatibility" in script/ci 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-03-17 11:35:10 +08:00
Joffrey F
73aff2b50f Merge pull request #4621 from shin-/3880-handle-broken-pipe 
Do not raise a broken pipe error when receiving SIGPIPE
 2017-03-16 14:59:23 -07:00
Joffrey F
61b4d9d001 Merge pull request #4626 from albers/completion--project-directory 
Add bash completion for `--project-directory`
 2017-03-16 14:58:52 -07:00
Joffrey F
eaee7aa5d0 Merge pull request #4625 from albers/completion-build--build-arg 
Add bash completion for `build --build-arg`
 2017-03-16 14:58:25 -07:00
Joffrey F
b26562147c Merge pull request #4616 from dnephin/update-schema-v3.2 
Synchronize the schema with docker/docker
 2017-03-16 12:46:19 -07:00
Harald Albers
6a773a018e Rename variables in bash completion 
The old names were supposed to designate variables that get propagated
to the Docker daemon. This is not true for all contained options and
therefore confused me.
The new names focus on the placement after the top level command.

Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-16 16:05:19 +01:00
Harald Albers
de2dd5b3d3 Add bash completion for --project-directory 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-16 15:47:01 +01:00
Harald Albers
583c673c8a Add bash completion for build --build-arg 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-03-16 11:37:06 +01:00
Joffrey F
7b19009511 Fix a handful of issues with 3.2 schema 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-15 17:11:53 -07:00