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

1362 Commits

Author SHA1 Message Date
Fred Lifton eb073c53f4 Merge pull request #1249 from asveepay/update_doc 
Update install docs for permission denied error
 2015-04-03 12:31:38 -07:00
Roland Cooper d866415b9a Update install docs for permission denied error 
Signed-off-by: Roland Cooper <rcooper@enova.com>
 2015-04-03 12:21:15 -05:00
Aanand Prasad dd40658f87 Merge pull request #1238 from aanand/use-docker-1.6-rc3 
Use Docker 1.6 RC3
 2015-04-03 13:00:49 -04:00
Aanand Prasad b3382ffd4f Use Docker 1.6 RC4 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-03 10:57:28 -04:00
Aanand Prasad 15a0fac939 Merge pull request #1141 from bfirsh/contributing-section-in-readme 
Add contributing section to readme
 2015-04-03 10:56:06 -04:00
Laurent Arnoud e3cff5d17d Docs: fix env_file example 
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
 2015-04-01 11:15:09 +02:00
Daniel Nephin 0f70b8638f Merge pull request #1213 from moysesb/relative_build 
Make value of 'build:' relative to the yml file.
 2015-03-31 21:20:02 -04:00
Moysés Borges 8584525e8d Interpret 'build:' as relative to the yml file 
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.

* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)

Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
 2015-03-31 18:47:26 -03:00
Aanand Prasad e3e2247159 Merge pull request #1231 from aanand/docker-1.6rc2 
Test against Docker 1.6 RC2 only
 2015-03-31 16:31:03 -04:00
Aanand Prasad 0650c4485a Test against Docker 1.6 RC2 only 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 16:04:22 -04:00
Aanand Prasad e708f4f59d Merge pull request #1226 from aanand/merge-multi-value-options 
Merge multi-value options when extending
 2015-03-31 16:01:22 -04:00
Aanand Prasad 907918b492 Merge multi-value options when extending 
Closes #1143.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-31 15:30:59 -04:00
Aanand Prasad 6dbe321a45 Merge pull request #1225 from aanand/fix-1222 
When extending, `build` replaces `image` and vice versa
 2015-03-31 15:23:34 -04:00
Aanand Prasad 2a415ede08 When extending, `build` replaces `image` and vice versa 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-30 17:14:19 -04:00
Ben Firshman 43369cda9c Merge pull request #1221 from aanand/update-swarm-doc 
Update Swarm doc
 2015-03-30 18:08:16 +01:00
Aanand Prasad a2557a3354 Merge pull request #1198 from funkyfuture/reformat-contributing.md 
Reformat CONTRIBUTING.md
 2015-03-30 12:08:56 -04:00
Aanand Prasad 1a14449fe6 Update Swarm doc 
- Co-scheduling will now work, so we can remove the stuff about
  `volumes_from` and `net` and manual affinity filters.

- Added a section about building.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-30 11:34:26 -04:00
Joseph Page 0b89ae6f20 [cli] run --rm overrides restart: always 
docker/compose#1013

Signed-off-by: Joseph Page <joseph.page@rednet.io>
 2015-03-30 14:45:24 +02:00
Patrick Chanezon cec6dc28bb implemented @fredl suggestions 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 17:12:29 -07:00
Aanand Prasad 853ce255ea Merge pull request #1202 from aanand/jenkins-script 
WIP: Jenkins script
 2015-03-27 14:59:49 -07:00
Aanand Prasad db852e14e4 Add script/ci 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-27 14:39:32 -07:00
Patrick Chanezon 98dd0cd1f8 implemented @aanand comments 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-27 13:26:51 -07:00
Patrick Chanezon c441ac90d6 paulczar fixes plus example file 
Signed-off-by: Patrick Chanezon <patlist@chanezon.com>
 2015-03-26 16:35:53 -07:00
Aanand Prasad 9d7b54d8fd Merge pull request #1183 from pborreli/patch-2 
Fixed typo
 2015-03-26 12:31:07 -07:00
Pascal Borreli 59f04c6e29 Fixed typo 
Signed-off-by: Pascal Borreli <pascal@borreli.com>
 2015-03-26 19:03:06 +00:00
Aanand Prasad 367ae0c848 Merge pull request #1185 from akoskaaa/master 
Make test files and config files pep8 valid
 2015-03-26 10:04:37 -07:00
akoskaaa 4e0f555c58 make flake8 a bit more specific 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-26 09:09:15 -07:00
Ben Firshman baf18decae Merge pull request #1179 from aanand/test-1.6-rc 
Add Docker 1.6 RC2 to tested versions
 2015-03-26 14:18:36 +00:00
funkyfuture 826b8ca4d3 Reformat CONTRIBUTING.md 
- some reformatting to make it better readable in smaller terminals
- adds a note that suggests validating DCO before pushing

Signed-off-by: funkyfuture <funkyfuture@riseup.net>
 2015-03-26 13:11:05 +01:00
akoskaaa fa2fb6bd38 [pep8] flake8 run for everything, fix items from this change 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 23:15:34 -07:00
akoskaaa f9ea5ecf40 [pep8] make test files and config files pep8 valid 
Signed-off-by: akoskaaa <akos.hochrein@prezi.com>
 2015-03-25 20:20:38 -07:00
Aanand Prasad 99f7eba930 Add Docker 1.6 RC2 to tested versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-25 14:48:39 -07:00
Ben Firshman e1b27acd02 Add contributing section to readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-25 17:22:04 +01:00
Ben Firshman 9aab7bc242 Merge pull request #1172 from aanand/fix-dns 
Fix regression in Dns and DnsSearch settings
 2015-03-25 16:11:13 +00:00
Aanand Prasad 83dcceacaf Fix regression in Dns and DnsSearch settings 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-24 16:17:05 -07:00
Aanand Prasad 1f06070f12 Merge pull request #1160 from aanand/fix-volume-merging 
Fix volume merging
 2015-03-24 13:40:07 -07:00
Aanand Prasad 35c6e0314c Fix volume merging when there's no explicit host path 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-24 13:26:36 -07:00
Aanand Prasad 276e43ca6b Fix service dict merging when only one dict has a volumes key 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-24 13:26:36 -07:00
Aanand Prasad b7046777d1 Merge pull request #1161 from aanand/revert-labels-and-dependencies 
Revert labels and dependencies
 2015-03-24 13:05:46 -07:00
Aanand Prasad 1c14fc06da Update docker-py and requests version ranges 
Leave the pinned versions in requirements.txt alone, as there's an
incompatibility between PyInstaller and requests 2.5.2 and 2.5.3, and by
extension with docker-py 1.1.0.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:18 -07:00
Aanand Prasad f4ef2c09d6 Revert "Remove restriction for requests version, update docker-py requirement" 
This reverts commit 81a32a266f.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:15 -07:00
Aanand Prasad 16495c577b Revert "Use dev version of Docker" 
This reverts commit d209ded13c.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:10 -07:00
Aanand Prasad 965426e39b Revert "Add 'labels:' config option" 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:04 -07:00
Aanand Prasad 02f119e4b7 Merge pull request #1145 from aanand/labels 
Implement `labels` option
 2015-03-20 18:53:26 -07:00
Aanand Prasad 721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad d209ded13c Use dev version of Docker 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad 49c2080bcd Merge pull request #1088 from aanand/extends 
`extends` – Inherit services from other services
 2015-03-20 16:00:50 -07:00
Aanand Prasad 37efdb1f8b Make volume host paths relative to file, merge volumes when extending 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 4c582e4352 Implement `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 5dca6c232e Merge pull request #972 from aanand/set-host-config-at-create-time 
Make Swarm schedule containers on the same node when they are linked together
 2015-03-20 15:43:52 -07:00