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

1195 Commits

Author SHA1 Message Date
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
Aanand Prasad eef4bc3917 Specify all HostConfig at create time 
This is required for Swarm integration: the cluster needs to know
about config like `links` and `volumes_from` at create time so that it
can co-schedule containers.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:14:07 -07:00
Ben Firshman 9931cd2c4c Merge pull request #1140 from jfrazelle/add-to-readme 
Add build status \o/
 2015-03-20 01:03:37 +00:00
Jessica Frazelle 0226675766 Add build status \o/ 
Signed-off-by: Jessica Frazelle <jess@docker.com>
 2015-03-19 17:50:15 -07:00
Ben Firshman ae9c965823 Merge pull request #1128 from aanand/jenkins-dco 
Validate DCO in script/test-versions
 2015-03-18 14:49:40 +00:00
Daniel Nephin d7a90092c2 Merge pull request #1118 from funkyfuture/issue-1082 
Change port in ports-composefile to 49152
 2015-03-17 21:39:34 -04:00
Aanand Prasad 85fb8956f3 Validate DCO in script/test-versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-17 18:02:22 -07:00
Ben Firshman 1e5b9dc2eb Merge pull request #1005 from aanand/docker-in-docker 
Run tests using Docker-in-Docker so we can test multiple versions
 2015-03-17 15:13:59 +00:00
Ben Firshman d21b8f1ba3 Merge pull request #1112 from bfirsh/remove-wercker-from-readme 
Remove wercker status from readme
 2015-03-16 23:53:18 +00:00
funkyfuture 4c5a80f253 Change port in ports-composefile to 49152 
This shall lower the propability to interfere with another service (e.g. the
WebUI of an application) that is running on the machine where tests are run.

Signed-off-by: funkyfuture <funkyfuture@riseup.net>
 2015-03-17 00:21:29 +01:00
Ben Firshman 198598c936 Remove wercker status from readme 
Because it doesn't really work anymore and looks scary when it's broken.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-13 19:36:54 +00:00
Ben Firshman 8b5a882459 Merge pull request #867 from knutwalker/feature/timeout-flag 
Add timeout flag to stop, restart, and up
 2015-03-13 17:41:16 +00:00
Ben Firshman dae451019b Merge pull request #1099 from aanand/fix-env-file-resolution 
Fix env file resolution
 2015-03-13 16:49:10 +00:00
Ben Firshman dfc729b8f2 Merge pull request #1108 from aanand/fix-deps-tests 
Fix Project.up() tests
 2015-03-13 16:38:25 +00:00
Aanand Prasad eb7ea76d6c Merge pull request #1100 from vmalloc/patch-3 
Remove restriction for requests version, update docker-py requirement
 2015-03-13 16:22:40 +00:00
Aanand Prasad 3c8ef6a94c Fix Project.up() tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:51:26 +00:00
Ben Firshman 081afd9bbf Merge pull request #1097 from aanand/script-shell 
Add script/shell
 2015-03-13 14:43:47 +00:00
Aanand Prasad 528bed9ef6 Fix environment resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:22:28 +00:00