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

4138 Commits

Author SHA1 Message Date
Joffrey F 9036c8f85a Merge pull request #4727 from shin-/4722-port_spec_fix 
Fix ServicePort.legacy_repr bug for `ext_ip::target` notation
 2017-04-12 14:21:30 -07:00
Joffrey F 1891b2b78c Fix ServicePort.legacy_repr bug for `ext_ip::target` notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-11 14:45:14 -07:00
Joffrey F 0f00aa4098 Convert paths to unicode in get_config_path_from_options if needed 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 17:45:06 -07:00
Joffrey F 94defc159a Merge pull request #4716 from shin-/4415-init_init_path 
Add support for service.init
 2017-04-10 14:42:18 -07:00
Joffrey F d0d684f03d Merge pull request #4715 from shin-/4708-ipam_options 
Add support for IPAM options in v2 format
 2017-04-10 14:40:44 -07:00
Joffrey F 2b61afb45f Merge pull request #4713 from shin-/4710-project_dir_fix 
Fix Config.find for Compose files in nested folders
 2017-04-10 14:39:37 -07:00
Joffrey F 843a0d82a0 Add support for IPAM options in v2 format 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:24:05 -07:00
Joffrey F b5ed31e4f5 Merge pull request #4714 from shin-/4707-fix-config-python3 
Fix serializer bug (python 3)
 2017-04-10 12:20:52 -07:00
Joffrey F cc966a7e19 Add support for init and init_path 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-10 12:16:57 -07:00
Joffrey F 5a4293848c Add 2.2 schema for API 1.25 features support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 19:17:11 -07:00
Joffrey F ce44c865e5 Merge pull request #4698 from shin-/4624-disable-pip-version-check 
Prevent pip version checks when calling `pip freeze`
 2017-04-07 17:23:12 -07:00
Joffrey F 72a2ea9d86 Fix serializer bug (python 3) 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 16:54:31 -07:00
Joffrey F 3b02426236 Fix Config.find for Compose files in nested folders 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-07 12:19:37 -07:00
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 c3662697d7 Merge pull request #4697 from docker/bump-1.12.0 
Bump 1.12.0
 2017-04-05 11:21:50 -07:00
Joffrey F e7e159076b Prevent pip version checks when calling `pip freeze` 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-04 15:31:38 -07:00
Joffrey F b31ff33aca Bump 1.12.0 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:19:16 -07:00
fate-grand-order b195a09a54 fix misspell "compatibility" in script/ci 
Signed-off-by: fate-grand-order <chenjg@harmonycloud.cn>
 2017-04-03 13:18:26 -07:00
Harald Albers 7a0e56a0c7 Add bash completion for `config --resolve-image-digests|--volumes"` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-03 13:18:26 -07:00
Harald Albers 5b6ddd5e30 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-04-03 13:18:26 -07:00
Harald Albers d917ca3e4e Add bash completion for `pull --parallel` 
Signed-off-by: Harald Albers <github@albersweb.de>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer c9a9f5ab03 Add zsh completion for 'docker-compose config --resolve-image-digests --volumes' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer ba787a45b9 Add zsh completion for 'docker-compose build --build-arg' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer cfdc9d67c8 Add zsh completion for 'docker-compose run -v --volume' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Steve Durrheimer 752d8d165f Add zsh completion for 'docker-compose images' 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2017-04-03 13:18:26 -07:00
Joffrey F 21cdd3f6d7 Bump docker SDK dependency Update invalid ports test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:18:26 -07:00
Joffrey F f9a9d97489 Add 3.2 schema to docker-compose.spec 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-03 13:18:26 -07:00
King Chung Huang bc1a876937 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-04-03 13:18:26 -07:00
Joffrey F f731a229c7 Merge remote-tracking branch 'source/release' into bump-1.12.0 2017-04-03 12:44:11 -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 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
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 08dc2a4152 Bump 1.12.0-rc2 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-23 17:53:32 -07:00
Joffrey F 7575f40069 Ignore unicode error in subprocess call 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-23 17:53:32 -07:00
Joffrey F 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
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