tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
2,634 Commits 25 Branches 265 Tags 53 MiB
Commit Graph

525 Commits

Author SHA1 Message Date
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
Aanand Prasad 50fe014ba9 Remove hardcoded host from Engine install URLs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:10:32 +00:00
Aanand Prasad 10dfd54ebe Update install page with link to Windows Toolbox install instructions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 18:09:38 +00:00
Aanand Prasad 7424938fc8 Move ipv4_address/ipv6_address docs to reference section 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-17 11:32:36 +00: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
Aanand Prasad 9853b876af Merge pull request #3101 from bfirsh/less-scary-swarm-compose-docs 
Better Compose in production docs
 2016-03-14 16:12:46 +00:00
Ben Firshman 1485a56c75 Better Compose in production docs 
The Compose/Swarm integration has been working really well for
users, so it seems pretty safe to remove the scary warnings about
it not being ready.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2016-03-10 08:55:07 -08:00
Matt Daue ee136446a2 Fix #2804: Add ipv4 and ipv6 static addressing 
- Added ipv4_network and ipv6_network to the networks section in the
  service section for each configured network
- Added feature documentation
- Added unit tests

Signed-off-by: Matt Daue <mattdaue@gmail.com>
 2016-03-09 18:37:52 -05:00
Joffrey F 7a30fc0983 Merge pull request #3089 from ltiao/patch-1 
Fixed indentation level in example.
 2016-03-09 10:56:50 -08:00
Aanand Prasad e700d7ca6a Fix version in docs example 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-08 18:15:18 +01:00
Louis Tiao 88a719b4b6 Fixed indentation level in example. 
Signed-off-by: Louis Tiao <louistiao@gmail.com>
 2016-03-08 15:53:55 +11: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
Aanand Prasad 1655be6c5b Merge pull request #2601 from dnephin/dont_build_on_up 
Only build as part of `up` if `--build` flag is set
 2016-03-02 15:02:18 -08: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 3f3c05e465 Merge pull request #3049 from aanand/clarify-depends-on 
Clarify depends_on logic
 2016-03-02 11:59:06 -08:00
Aanand Prasad aa7b862f4c Clarify depends_on logic 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-03-02 10:29:24 -08: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
Aanand Prasad 7684604830 Merge pull request #3023 from londoncalling/fix-note-3019 
WIP: updated note format for dockerfile per Aanand's comments on PR #…
 2016-03-01 11:11:55 -08:00
Aanand Prasad fc99c7ee19 Merge pull request #2584 from mjgpy3/patch-1 
Update `volumes_from` docs to state default
 2016-02-29 15:37:46 -08:00
Daniel Nephin f5ce31d43e Merge pull request #3024 from aanand/update-build-image-docs 
Update docs about using build and image together
 2016-02-29 14:03:54 -08:00
Daniel Nephin 4db1fef58c Merge pull request #3022 from aanand/update-build-image-extends-note 
Update note about build + image with extends
 2016-02-29 14:03:28 -08:00
Daniel Nephin 8d24af92e0 Merge pull request #3030 from aanand/document-startup-order-workarounds 
Document ways to make services wait for dependencies
 2016-02-29 13:01:32 -08:00
Aanand Prasad 6b947ee478 Document ways to make services wait for dependencies 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-29 11:24:58 -08:00
Tomas Tomecek d28c5dda92 implement exec 
Resolves #593

Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
 2016-02-29 10:50:09 +01:00
Aanand Prasad 62fb6b99eb Update FAQ regarding long stop times 
- It happens on recreate, not just stop

- We now support `stop_signal`, which can help in some cases

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-26 14:34:44 -08:00
Aanand Prasad c72e9b3843 Add release notes for 1.6.2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:55:04 -08:00
Aanand Prasad 5be48ba1ed Update docs about using build and image together 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 17:19:58 -08:00
Victoria Bialas 5cc420e727 WIP: updated note format for dockerfile per Aanand's comments on PR #3019 
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-25 16:47:46 -08:00
Aanand Prasad 2cd1b94dd3 Update note about build + image with extends 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-25 15:15:18 -08:00
Daniel Nephin 49ef8a271d Add release notes for 1.6.1 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-23 15:13:01 -08:00
Victoria Bialas e6797e1166 updated Wordpress example to be easier to follow, added/updated images 
docs update per Mary's comments on the PR

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-23 11:59:19 -08:00
Joffrey F 176b966486 Update documentation for volume_driver option. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-22 16:51:33 -08:00
Daniel Nephin c7ceacfeae Merge pull request #2948 from dnephin/validate_top_level 
Validate that each section of the config is a mapping
 2016-02-19 13:41:50 -05:00
Aanand Prasad bed0cfeb32 Merge pull request #2807 from aanand/swarm-doc 
Update Swarm integration guide and make it an official part of the docs
 2016-02-19 10:25:28 -08:00
Daniel Nephin 0d218c34c7 Make config validation error messages more consistent. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-19 13:12:57 -05:00
Aanand Prasad 520c695bf4 Update Swarm integration guide and make it an official part of the docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-19 09:32:43 -08:00
Victoria Bialas eb4a98c0d1 corrected description of network aliases, added real-world example per #2907 
copyedit to make  show as file format

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-18 18:05:52 -08:00
Joffrey F 7152f7ea76 Handle mismatched network formats in config files 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:24:41 -08:00
Joffrey F 825a0941f0 Network aliases are now part of the network dictionary 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Joffrey F 7801cfc5d1 Document network_aliases config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-18 15:23:47 -08:00
Daniel Nephin 471264239f Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:26 -05:00
Daniel Nephin 4de12ad7a1 Update link to docker volume create docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:22 -05:00
Victoria Bialas 8af0a0f85b update to description of files generated from examples, which are no longer owned by root w/new release 
updated descriptions of changing file ownership and images per Seb's comments

fixed line wraps

fixed line breaks per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-16 11:34:59 -08:00
moxiegirl b8c35e1298 Merge pull request #2884 from moxiegirl/remove-tutorials 
Updating Dockerfile
 2016-02-16 08:09:49 -08:00
Daniel Nephin 7bae4cdbb2 Merge pull request #2875 from aanand/fix-version-in-install-guide 
Fix version in install guide
 2016-02-11 12:43:51 -05:00