tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-27 23:54:04 +02:00
Code Issues Packages Projects Releases Wiki Activity
2,587 Commits 21 Branches 282 Tags
Commit Graph

2587 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
ce322047a0 Move config hash tests to service_test.py 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:27:11 -05:00
Daniel Nephin
0227b3adbd Upgrade pyyaml to 3.11 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:26:54 -05:00
Daniel Nephin
d18ad4c812 Fix rebase-bump-commit script when used with a final release. 
Previously it would find commits for RC releases, which broke the rebase.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -05:00
Daniel Nephin
6b002fb922 Cherry-pick release notes froim 1.5.0 
And bump version to 1.6.0dev

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-05 10:25:46 -05:00
Daniel Nephin
50f06c6ba2 Merge pull request #2325 from dnephin/fix_jenkins_build 
Fix jenkins CI
 2015-11-04 17:25:17 -05:00
Daniel Nephin
385b4280a1 Fix jenkins CI by using an older docker version to match the host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-04 15:33:37 -05:00
Aanand Prasad
6a8806fe8d Merge pull request #2304 from dnephin/remove_start_container 
Remove service.start_container()
 2015-11-04 10:19:33 +00:00
Aanand Prasad
9c8173dbfd Merge pull request #2309 from dnephin/bump-1.5.0 
WIP: Bump 1.5.0
 2015-11-03 18:31:56 +00:00
Daniel Nephin
77ff37a853 Bump 1.5.0 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.5.0 		2015-11-03 12:36:30 -05:00
Daniel Nephin
40341674bd Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
62ebdce5a9 Replace composition with Compose app. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
58de4e0c26 Document using multiple Compose files use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
dbd6c62b70 Changes to production.md for working with multiple Compose files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
887c6753f8 Support a volume to the docs directory and add --watch, so docs can be refreshed. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Daniel Nephin
bd35896892 Remove duplication from extends docs. 
Start restructuring extends docs in preparation for adding documentation about using multiple compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 12:36:30 -05:00
Aanand Prasad
4ebe68e612 Merge pull request #2290 from dnephin/docs_multi_file_compose 
Docs for using multiple compose files
 2015-11-03 17:14:57 +00:00
Daniel Nephin
9286e62449 On a test failure only show the last 100 lines of daemon output. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:54:59 -05:00
Daniel Nephin
621d1a5167 Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:54:59 -05:00
Daniel Nephin
e503e085ac Re-order extends docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:52:44 -05:00
Daniel Nephin
83714fbac2 Touch up intro paragraph with feedback from @moxiegirl. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
413921a287 Add another feature to the docs - multiple environments per host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
7ee36829ac Update intro docs based on feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
bfb46b37d3 Updates to gettingstarted guide from PR feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
09d2bdbb21 Flush out features and use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
8733d09a9c Extract the getting started guide from the index page. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
e524cce222 Add missing title to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:33:23 -05:00
Daniel Nephin
8bdde9a731 Replace composition with Compose app. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
eab265befa Document using multiple Compose files use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
c5cf5cfad4 Changes to production.md for working with multiple Compose files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
1c4c7ccfac Support a volume to the docs directory and add --watch, so docs can be refreshed. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Daniel Nephin
7014cabb04 Remove duplication from extends docs. 
Start restructuring extends docs in preparation for adding documentation about using multiple compose files.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 11:28:51 -05:00
Aanand Prasad
767a13f771 Merge pull request #2165 from dnephin/more_user_docs 
Restructure intro docs
 2015-11-03 16:22:28 +00:00
Daniel Nephin
3d9e3d0877 Remove service.start_container() 
It has been an unnecessary wrapper around container.start() for a little while now, so we can call it directly.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-03 10:17:09 -05:00
Aanand Prasad
19a41997c2 Merge pull request #2306 from dnephin/cli_tests_use_cli 
Update cli test suite to run the executable in a child process
 2015-11-03 15:05:47 +00:00
Daniel Nephin
45635f7097 Move cli tests to a new testing package. 
These cli tests are now a different kind of that that run the compose binary. They are not the same as integration tests that test some internal interface.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 19:28:58 -05:00
Daniel Nephin
8057bb3fcc Update cli tests to use subprocess. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 17:35:00 -05:00
Daniel Nephin
c58cf036e3 Touch up intro paragraph with feedback from @moxiegirl. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
a3fb13e141 Add another feature to the docs - multiple environments per host. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
d9bc91b7cc Update intro docs based on feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
db3b90b84e Updates to gettingstarted guide from PR feedback. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
86d845fde3 Flush out features and use cases. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
186d43c59f Extract the getting started guide from the index page. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
53a0de7cf2 Add missing title to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 15:16:23 -05:00
Daniel Nephin
3738da09e2 Merge pull request #2298 from dnephin/update_networking_test_for_rc4 
Fix networking tests to work with new API in engine rc4
 2015-11-02 15:10:17 -05:00
Daniel Nephin
abde64d610 On a test failure only show the last 100 lines of daemon output. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 14:16:52 -05:00
Daniel Nephin
1b5b407619 Fix networking tests to work with new API in engine rc4 (https://github.com/docker/docker/pull/17536) 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-02 13:40:56 -05:00
Daniel Nephin
be6b811c4e Bump 1.5.0rc3 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
1.5.0rc3 		2015-10-30 15:53:17 -04:00
Daniel Nephin
bdb9a280bc Make storage driver configurable in CI 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:53:16 -04:00
Daniel Nephin
73ca4eb599 On error print daemon logs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:46:57 -04:00
Daniel Nephin
569ccbadec Convert the README to rst and fix the logo url before packaging it up for pypi. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:46:57 -04:00