tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-28 08:04:09 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,489 Commits 21 Branches 282 Tags
Commit Graph

1489 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Daniel Nephin
87b4545b44 Merge pull request #1508 from thaJeztah/update-dockerproject-links 
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9f67cc719d5f3bfa9e3adbfb16a34eb)
 2015-06-15 11:22:07 -07:00
Aanand Prasad
58a7844129 Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore 
Make it possible to run tests remotely
(cherry picked from commit c8e096e0895cb3589c4699daa44c299ea23f790c)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Daniel Nephin
4353f7b9f9 Merge pull request #1475 from fordhurley/patch-1 
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26f7b1ce097a6b475799364720bcb6cb)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
8f8693e13e Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop 
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744b4005441b289f6b3fb4eef551b5214)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Ben Firshman
363a6563c7 Merge pull request #1537 from aanand/reorder-service-utils 
Reorder service.py utility methods
(cherry picked from commit e3525d64b55ba6b95adab54ac0b5baf22d7740e0)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
59d6af73fa Merge pull request #1539 from bfirsh/add-image-affinity-to-test 
Add image affinity to test script
(cherry picked from commit 4c2112dbfd4da219f2585569b716b59f7562b034)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
cd7f67018e Merge pull request #1466 from noironetworks/changing-scale-to-warning 
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c59774a8cbf503a57cb9f3b0d47d1fe)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Ben Firshman
b7e8770c4f Merge pull request #1538 from thieman/tnt-serivce-misspelled 
Correct misspelling of "Service" in an error message
(cherry picked from commit bd246fb011aa6805d57eb31d641e3c072c072d63)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:07 -07:00
Aanand Prasad
ad4cc5d6df Merge pull request #1497 from aanand/use-1.7-rc1 
Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3c672902a5241f557ed81df19255ccc)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07:00
Aanand Prasad
ca14ed68f7 Merge pull request #1533 from edmorley/update-b2d-shellinit-example 
Docs: Update boot2docker shellinit example to use 'eval'
(cherry picked from commit 17e03b29f9381a10f08e551f0c88899b7961664f)
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07:00
Daniel Nephin
71514cb380 Merge pull request #1531 from aanand/test-crash-resilience 
Test that data volumes now survive a crash when recreating
(cherry picked from commit 87c30ae6e48c2341593b03770089e3ff86108881)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 11:22:06 -07: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
8212f1bd45 Merge pull request #1529 from aanand/update-dockerpty 
Update dockerpty to 0.3.4
(cherry picked from commit 95b2eaac042bb761b4f94c35a1af539467714098)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 18:24:14 -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
Daniel Nephin
dca3bbdea3 Merge pull request #1527 from aanand/remove-logging-on-run-rm 
Remove logging on run --rm
(cherry picked from commit 5578ccbb0113e285a20aeeee820c03766ef1ae6e)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:53 -04:00
Daniel Nephin
8ed7dfef6f Merge pull request #1525 from aanand/fix-duplicate-logging 
Fix duplicate logging on up/run
(cherry picked from commit e2b790f7328482591863e496de14c825fd3f8a23)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:52 -04:00
Daniel Nephin
631f5be02f Merge pull request #1481 from albers/completion-smart-recreate 
Support --x-smart-recreate in bash completion
(cherry picked from commit 9a0bb325f2d1203b7aac915c3bfca4347cc93489)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:52 -04:00
Ben Firshman
4f4ea2a402 Merge pull request #1325 from sdurrheimer/master 
Zsh completion for docker-compose
(cherry picked from commit b638728d6ca21982e321b4069ef92f8367f069f4)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	docs/completion.md
 2015-06-09 14:39:50 -04:00
Aanand Prasad
5a5bffebd1 Merge pull request #1464 from twhiteman/bug1461 
Possible division by zero error when pulling an image - fixes #1463
(cherry picked from commit d0e87929a1f39b4e98c2c8497f3f0ffc09fb9e43)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-09 14:39:05 -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