jyapayne/compose
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
3,173 commits 9 branches 77 tags 9.3 MiB
Commit graph

3,173 commits

This branch
This branch
All branches
Author SHA1 Message Date
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 1.5.0rc3 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 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
Daniel Nephin
ed1b584c42 Fix release script notes about software and typos. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:46:57 -04:00
Daniel Nephin
2f2e946907 Don't set a default network driver, let the server decide. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:36:15 -04:00
Daniel Nephin
d392f70cc6 Fixes #1843, #1936 - chown files back to host user in django example. 
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:36:15 -04:00
Daniel Nephin
db164cefd3 Remove the duplicate 'Warning' prefix now that the logger adds the prefix. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:36:15 -04:00
Daniel Nephin
4d613d3ba7 Use colors when logging warnings or errors, so they are more obvious. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 15:36:15 -04:00
Joffrey F
1f26841e23 Integration test for run command with networking enabled 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-30 15:36:15 -04:00
Joffrey F
9370cb033c Ensure network exists when calling run before up 
Otherwise the daemon will error out because the network doesn't exist
yet.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-30 15:36:15 -04:00
Daniel Nephin
77e1fe1915 Merge pull request #2295 from dnephin/default_network_should_be_none 
Don't set a default network driver, let the server decide
 2015-10-30 15:29:30 -04:00
Daniel Nephin
66ef2519d3 Merge pull request #2265 from dnephin/volumes_in_guides_doc 
Update tutorials and small fix with rails tutorial
 2015-10-30 13:30:00 -04:00
Daniel Nephin
c7d164d01c Fixes #1843, #1936 - chown files back to host user in django example. 
Also add a missing 'touch Gemfile.lock' to fix the rails tutorial.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 12:42:15 -04:00
Daniel Nephin
491d052088 Don't set a default network driver, let the server decide. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-30 11:53:36 -04:00
Daniel Nephin
c439e056a0 Merge pull request #2288 from dnephin/warning_about_vars 
Add console color to warnings and errors so they are more obvious
 2015-10-30 10:58:00 -04:00
Daniel Nephin
04a76dc284 Merge pull request #2287 from shin-/2284-ensure-network-exists-run 
Ensure network exists when calling run before up
 2015-10-30 10:41:55 -04:00
Joffrey F
072e7687ae Integration test for run command with networking enabled 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-10-30 14:15:47 +01:00