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

1267 Commits

Author SHA1 Message Date
Aanand Prasad ae96e1af16 Use Docker 1.7.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-18 10:34:34 -07:00
Aanand Prasad 4e73e86d94 Merge pull request #1563 from moxiegirl/hugo-test-fixes 
Hugo final 1.7 Documentation PR -- please read carefully
 2015-06-18 10:20:10 -07:00
Mary Anthony c26b1c8ee9 Entering fixes from Hugo 
renaming compose-overview back to index
Updating with fixes per Aanand. And others found through test

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-17 21:50:43 -07:00
Aanand Prasad 77c939b256 Merge pull request #1142 from calou/master 
Added support of option mac-address
 2015-06-17 14:39:00 -07:00
Sébastien Gruchet b76ac6e633 Added support to option mac-address 
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Updated doc

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Fixed LINT errors

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed mac-address entry order in config keys

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>

Changed attributes order in docs/yml.md

Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
 2015-06-17 21:28:17 +02:00
Daniel Nephin 26ea27172e Merge pull request #1558 from aanand/use-docker-1.7-rc4 
Use Docker 1.7 RC5
 2015-06-16 22:01:50 -04:00
Aanand Prasad bc7161b475 Merge pull request #1552 from aanand/add-upgrade-instructions 
Add upgrading instructions to install docs
 2015-06-16 16:26:40 -07:00
Aanand Prasad e0af1a44ea Use Docker 1.7 RC5 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-16 15:14:48 -07:00
Aanand Prasad bc14c473c9 Merge pull request #1521 from dano/validate-service-names 
Validate that service names passed to Project.containers aren't bogus.
 2015-06-16 10:45:49 -07:00
Dan O'Reilly 464ab3d727 Add a method specifically for service name validation. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-06-15 23:06:06 -04:00
Daniel Nephin f3df2a9fec Merge pull request #1551 from aanand/use-docker-1.7-rc3 
Use Docker 1.7 RC3
 2015-06-15 21:33:07 -04:00
Aanand Prasad 5b2a0cc73d Merge pull request #1406 from vdemeester/667-compose-port-scale 
Fixing docker-compose port with scale (#667)
 2015-06-15 10:58:44 -07:00
Aanand Prasad acd8dce595 Add upgrading instructions to install docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:46:48 -07:00
Daniel Nephin b3b44b8e4c Merge pull request #1550 from aanand/update-docker-py 
Update setup.py with new docker-py minimum
 2015-06-15 13:43:57 -04:00
Aanand Prasad aaccd12d3d Merge pull request #1545 from moxiegirl/test-tooling 
Updated for new documentation tooling
 2015-06-15 10:36:37 -07:00
Aanand Prasad b4c49ed805 Use Docker 1.7 RC3 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:25:58 -07:00
Aanand Prasad 4e108e377e Update setup.py with new docker-py minimum 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 10:18:15 -07:00
Aanand Prasad 5231288b4e Merge pull request #1489 from dnephin/faster_integration_tests 
Faster integration tests
 2015-06-15 10:04:45 -07:00
Mary Anthony e40fc02561 Testing with documentation tooling 
Updating with changes
Updating for Hugo
Adding a README'
moving index.md compose-overview.md in links
changing overview
Updating image to pull

Signed-off-by: Mary Anthony <mary@docker.com>
 2015-06-14 16:00:08 -07:00
Daniel Nephin 06db577105 Move converge() to a test module, and use a short timeout for tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 17:18:27 -04:00
Travis Thieman c24d5380e6 Extend up -t to pass timeout to stop running containers 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin 60351a8e07 Speed up integration test and make cleanup easier by using labels 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin d827809ffb Use labels to filter containers. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-06-14 16:45:28 -04:00
Daniel Nephin 77e594dc94 Merge pull request #1544 from aanand/fix-volume-deduping 
Fix volume binds de-duplication
 2015-06-14 13:28:14 -04:00
Aanand Prasad 08bc4b830b Fix volume binds de-duplication 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-12 16:57:22 -04:00
Aanand Prasad 4c2112dbfd Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
 2015-06-12 11:56:02 -04:00
Ben Firshman ac222140e7 Add image affinity to test script 
This will allow tests to be run on a Swarm. This is being fixed in
Swarm 0.4: https://github.com/docker/swarm/issues/743

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-06-11 15:58:07 -07:00
Ben Firshman e3525d64b5 Merge pull request #1537 from aanand/reorder-service-utils 
Reorder service.py utility methods
 2015-06-11 21:55:33 +01:00
Ben Firshman bd246fb011 Merge pull request #1538 from thieman/tnt-serivce-misspelled 
Correct misspelling of "Service" in an error message
 2015-06-11 21:54:53 +01:00
Travis Thieman f31d4c8a93 Correct misspelling of "Service" in an error message 
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
 2015-06-11 14:03:08 -04:00
Aanand Prasad 7995fc2ed2 Reorder service.py utility methods 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-11 11:44:13 -04:00
Vincent Demeester a5fd91c705 Fixing docker-compose port with scale (#667) 
Fixes #667 and Closes #735 (taking over it)

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-06-10 23:26:33 +02:00
Aanand Prasad 0e9ccd36f3 Merge pull request #1497 from aanand/use-1.7-rc1 
Run tests against Docker 1.7 RC2
 2015-06-10 17:19:24 -04:00
Aanand Prasad 4fd5d58076 Test against Docker 1.7.0 RC2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-10 14:19:36 -04:00
Aanand Prasad 17e03b29f9 Merge pull request #1533 from edmorley/update-b2d-shellinit-example 
Docs: Update boot2docker shellinit example to use 'eval'
 2015-06-10 13:03:55 -04:00
Ed Morley e3ba302627 Docs: Update boot2docker shellinit example to use 'eval' 
The boot2docker documentation has since changed the recommended way to
use shellinit - see boot2docker/boot2docker#786.

Signed-off-by: Ed Morley <emorley@mozilla.com>
 2015-06-10 14:38:35 +01:00
Daniel Nephin 87c30ae6e4 Merge pull request #1531 from aanand/test-crash-resilience 
Test that data volumes now survive a crash when recreating
 2015-06-09 22:22:56 -04:00
Daniel Nephin 95b2eaac04 Merge pull request #1529 from aanand/update-dockerpty 
Update dockerpty to 0.3.4
 2015-06-09 18:21:14 -04:00
Aanand Prasad ff151c8ea0 Test that data volumes now survive a crash when recreating 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 13:06:09 -04:00
Aanand Prasad 66af37b135 Merge pull request #1474 from aanand/fix-ssl 
Fix SSL "CERTIFICATE_VERIFY_FAILED" error
 2015-06-09 11:56:27 -04:00
Dan O'Reilly c59c9dd951 Add integration test for service name verification 
Add a test to make sure NoSuchService is raised if
a bogus service name is given to 'docker-compose logs'.

Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-06-08 17:04:42 -04:00
Aanand Prasad ce880af821 Update dockerpty to 0.3.4 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 17:01:03 -04:00
Daniel Nephin 5578ccbb01 Merge pull request #1527 from aanand/remove-logging-on-run-rm 
Remove logging on run --rm
 2015-06-08 16:21:02 -04:00
Daniel Nephin 38a11c4c28 Merge pull request #1526 from aanand/remove-start-or-create-containers 
Remove Service.start_or_create_containers()
 2015-06-08 12:49:32 -04:00
Daniel Nephin e2b790f732 Merge pull request #1525 from aanand/fix-duplicate-logging 
Fix duplicate logging on up/run
 2015-06-08 12:48:46 -04:00
Aanand Prasad b6a7db787f Remove logging on run --rm 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 11:16:00 -04:00
Aanand Prasad db2d02dc0b Remove Service.start_or_create_containers() 
It's only used in a single test method.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:59:03 -04:00
Aanand Prasad f59b43ac27 Fix duplicate logging on up/run 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-08 10:52:15 -04:00
dano 2527ef8055 Validate that service names passed to Project.containers aren't bogus. 
Signed-off-by: Dan O'Reilly <oreilldf@gmail.com>
 2015-06-06 15:47:16 -04:00
Daniel Nephin 417e6ce0c9 Merge pull request #1508 from thaJeztah/update-dockerproject-links 
Update dockerproject.com links
 2015-06-04 11:18:23 -05:00