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

60 Commits

Author SHA1 Message Date
Joffrey F e7a8b2fed5 Update TLS version configuration code. Tests. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-06-03 11:45:22 -07:00
Aanand Prasad 3722bb38c6 Clarify behaviour of rm and down 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-04-11 16:31:27 +01:00
Joffrey F dcdcf4869b Mention environment file in envvars.md 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-24 10:57:01 -07:00
Aanand Prasad 8282bb1b24 Add TLS flags to CLI reference 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-24 14:41:51 +00:00
Joffrey F 187ea4cd81 Add --all option to rm command - remove one-off containers 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-21 12:12:52 +00:00
Kalle Møller 7fc40dd7cc Adding ssl_version to docker_clients kwargs 
Select tls version based of COMPOSE_TLS_VERSION

Changed from SSL to TLS

Also did docs - missing default value

Using getattr and raises AttributeError in case of unsupported version

Signed-off-by: Kalle Møller <github.com@k-moeller.dk>
 2016-03-19 01:15:03 +01:00
Joffrey F dd40331b44 Merge pull request #3102 from shin-/1477-a-modest-proposal 
Add flag to up/down to remove orphaned containers
 2016-03-16 10:58:15 -07:00
Joffrey F 20c29f7e47 Add flag to up/down to remove orphaned containers 
Add --remove-orphans to CLI reference docs
Add --remove-orphans to bash completion file
Test orphan warning and remove_orphan option in up

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-03-15 16:11:49 -07:00
Simon van der Veldt 658803edf8 Add -w or --workdir to compose run to override workdir from commandline 
Signed-off-by: Simon van der Veldt <simon.vanderveldt@gmail.com>
 2016-03-15 15:28:32 -04:00
Daniel Nephin 53a3d14046 Support multiple files in COMPOSE_FILE env var. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 18:47:58 -05:00
Daniel Nephin e1b87d7be0 Update reference docs for the new flag. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-03-02 15:32:51 -05:00
Aanand Prasad 0b3561a7d5 Merge pull request #2720 from seguins/2227-improvements-logs 
Add flags on logs
 2016-03-01 17:41:31 -08:00
Stéphane Seguin 9b36dc5c54 Add --tail flag as option on logs. 
Closes #265
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin d9b4286f91 Add -t, --timestamps flag as option on logs. 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:46 +01:00
Stéphane Seguin 82632098a3 Add -f, --follow flag as option on logs. 
Closes #2187
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2016-03-01 20:23:43 +01:00
Tomas Tomecek d28c5dda92 implement exec 
Resolves #593

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-02-29 10:50:09 +01:00
Mary Anthony a713447e0b Fixing duplicate identifiers 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-02 12:04:13 -08:00
Daniel Nephin 7b03de7d01 Move command reference to overview. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:46:52 -05:00
Daniel Nephin 2df5593e8f Cleanup command-line reference docs by renaming overview to envvars. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:46:28 -05:00
Daniel Nephin 5e30f089e3 Use the same capitalization for all menu items in the docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-02 10:46:28 -05:00
Mary Anthony 3fc72038c5 New navigation for 1.10 release 
Updating with Joffrey's comments

Signed-off-by: Mary Anthony <mary@docker.com>
 2016-01-27 12:05:56 -08:00
Aanand Prasad b84da7c78b Fix trailing whitespace in docker-compose.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-26 23:22:21 +00:00
Tobias Munk 5fe0b57e5c fixed documentation about traversing yml files 
Signed-off-by: Tobias Munk <schmunk@usrbin.de>
 2016-01-25 19:33:39 +01:00
Daniel Nephin c64af0a459 Add an acceptance test and docs for the down subcommand 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-14 11:11:08 -05:00
Evgeniy Dobrohvalov bf48a781db Add flag for stops all containers if any container was stopped. 
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
 2016-01-13 13:12:09 +03:00
Joffrey F ad8faad296 Merge pull request #2579 from vdemeester/update-reference-with-config-and-create 
Add config and create to docs/reference
 2016-01-12 15:16:45 -08:00
Aanand Prasad 063a25ae7d Merge pull request #2392 from dnephin/docker_compose_events 
docker-compose events
 2016-01-12 11:45:27 +00:00
Daniel Nephin 2f8cb55412 Merge pull request #2571 from vdemeester/fix-unpause-typo 
Fix typo in unpause reference doc
 2016-01-09 12:31:21 -05:00
Daniel Nephin d1d3969661 Add docker-compose event 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-08 13:43:30 -05:00
Vincent Demeester 0bca8d9cb3 Add config and create to docs/reference 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-06 21:28:52 +01:00
Vincent Demeester 4e75ed4231 Add missing --name flag to run reference doc 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-06 21:15:11 +01:00
Vincent Demeester 77d2aae72d Fix typo in unpause reference doc 
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2016-01-06 21:14:30 +01:00
Aanand Prasad 2e9a49b4eb Clarify behaviour of 'rm' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-12-17 17:50:45 +00:00
Daniel Nephin a21f9993b3 Remove migrate-to-labels. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-11-27 12:04:45 -05:00
Adrian Budau c5c36d8b00 Added --force-rm to compose build. 
It's a flag passed to docker build that removes the intermediate
containers left behind on fail builds.

Signed-off-by: Adrian Budau <budau.adi@gmail.com>
 2015-11-10 13:05:04 -05: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
Daniel Nephin fbfbe60246 Rename yml.md to compose-file.md and add an alias for the old url. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:51:34 -04:00
Daniel Nephin e6344f819a Rename yaml reference to compose file reference. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-14 09:50:37 -04:00
Mary Anthony 0e9c542865 Updating to new tooling:supports Github source linking 
Fixing HEAD
Updating to match daniel
Fixing the index link

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-10-13 14:04:25 -07:00
Daniel Nephin 182c2537d0 Fix links between reference sections 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 11:14:21 -04:00
Daniel Nephin cd48a7026a Cleanup doc reference links. 
Removed 'Compose command line completion' and 'Compose environment variables' from the list. command line completion is linked to from install docs, and environment variables are deprecated.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-10-09 11:13:24 -04:00
Mary Anthony 62ca8469b0 Fixing misspelling of WordPress 
Signed-off-by: Mary Anthony <mary@docker.com>
 2015-09-21 08:58:05 -07:00
mnowster b9252aa48e Merge pull request #2032 from villlem/master 
Flag to skip all pull errors when pulling images
 2015-09-21 13:41:08 +01:00
Aanand Prasad 18dbe1b1c0 Merge pull request #2051 from dnephin/extend_compose_files 
Extend compose files by allowing multiple files
 2015-09-21 12:34:22 +02:00
Vojta Orgon c9083e21c8 Flag to skip all pull errors when pulling images. 
Signed-off-by: Vojta Orgon <villlem@gmail.com>
 2015-09-21 11:59:23 +02:00
Daniel Nephin fd75e4bf63 Update docs about using multiple -f arguments 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-17 14:20:21 -04:00
Christophe Labouisse 39786d4da7 Add new --pull option in build. 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-09-15 20:19:17 +02:00
Daniel Nephin 1eb925ee31 Link between pages in the CLI reference section 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-09-10 13:53:26 -04:00
Daniel Nephin 860b304f4a Add COMPOSE_API_VERSION to the docs 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-09-10 13:53:19 -04:00
Joffrey F 80c9092999 Document COMPOSE_HTTP_TIMEOUT env config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2015-09-02 12:52:48 -07:00