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

1,964 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
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
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
Daniel Nephin
eb9b8dc592 Merge pull request #2283 from dnephin/fix_not_none_log_driver 
Logs are available for all log drivers except for none.
 2015-10-29 15:01:05 -04:00
Daniel Nephin
841ed4ed21 Remove the duplicate 'Warning' prefix now that the logger adds the prefix. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:18:28 -04:00
Daniel Nephin
d836973a04 Use colors when logging warnings or errors, so they are more obvious. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 14:06:50 -04:00
mnowster
057b8e291c Merge pull request #2286 from mnowster/2281-docs-curl-command 
Clarify the command is an example
 2015-10-29 17:20:59 +00:00
Joffrey F
596261e759 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-29 17:56:01 +01:00
Mazz Mosley
983dc12160 Clarify the command is an example 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-29 16:52:00 +00:00
Daniel Nephin
eab9d86a3d Logs are available for all log drivers except for none. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-29 11:28:17 -04:00
mnowster
6cd9bab35b Merge pull request #2276 from dnephin/update_networking_docs 
Update docs about networking for current release
 2015-10-29 15:19:02 +00:00
mnowster
64a2713714 Merge pull request #2264 from mnowster/2259-unicode-error-volume-paths 
Handle non-ascii volume directories
 2015-10-29 14:42:29 +00:00
Mazz Mosley
5dc14f3925 Handle non-ascii chars in volume directories 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-29 12:05:51 +00:00
mnowster
0b25014020 Merge pull request #2278 from dnephin/disable_flaky_test 
Disable flaky test against 1.8.3
 2015-10-29 12:04:54 +00:00
mnowster
3a2df57f3d Merge pull request #2273 from mnowster/cross-ref-docs 
Add cross references for env/cli
 2015-10-29 12:04:10 +00:00
Daniel Nephin
a71d9af522 Disable a test against docker 1.8.3 because it fails due to a bug in docker engine. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 17:54:38 -04:00
Daniel Nephin
0ef3b47f74 Update docs about networking for current release. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 15:17:11 -04:00
mnowster
66f1c8e6c0 Merge pull request #2272 from dnephin/update_release_docs_and_scripts 
Another release, another round of fixes to the release scripts
 2015-10-28 17:54:48 +00:00
mnowster
dfaa18ebc5 Merge pull request #2274 from mnowster/docs-key-dependency-clarification 
Clarify `dockerfile` requires `build` key
 2015-10-28 17:45:27 +00:00
Mazz Mosley
e13b8949b0 Add cross references for env/cli 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-28 17:42:30 +00:00
Mazz Mosley
c341860d11 Clarify dockerfile requires build key 
Credit to @funkyfuture for the first PR addressing the clarification.
https://github.com/docker/compose/pull/1767

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-28 17:27:38 +00:00
Daniel Nephin
8306405340 On error print daemon logs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 12:40:59 -04:00
Daniel Nephin
bbc76e6034 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-28 12:11:29 -04:00
Daniel Nephin
c4f0f24c57 Fix release script notes about software and typos. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-28 12:10:30 -04:00
mnowster
7e48b0b289 Merge pull request #2271 from mnowster/2270-pypi-page-info 
Include link to github for code & issues
 2015-10-28 15:30:07 +00:00
Mazz Mosley
379af594da Include link to github for code&issues 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-28 14:59:43 +00:00
Daniel Nephin
b6b9b002e5 Merge pull request #2254 from mnowster/1756-dont-display-output-from-previous-runs 
1756 dont display output from previous runs
 2015-10-27 18:45:47 -04:00
Mazz Mosley
76d52b1c5f Remove redundant try/except 
Code cleanup. We no longer need this as the api returns a 304 for any
stopped containers, which doesn't raise an error.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
30a84f1be6 Move rename functionality into Container 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
bee063c07d Fix tests 
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00
Mazz Mosley
7603ebea9b Attach to a container's log_stream before they're started 
So we're not displaying output of all previous logs for a container, we attach,
if possible, to a container before the container is started.

LogPrinter checks if a container has a log_stream already attached and
print from that rather than always attempting to attach one itself.

Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
 2015-10-27 17:12:18 +00:00