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

1253 Commits

Author SHA1 Message Date
Aanand Prasad c421d23c34 Update Swarm docs 
- Link to libnetwork

- Building now works, but is complicated by scaling

- Document how to set constraints/affinity

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-15 15:19:55 -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
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 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
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
Daniel Nephin 417e6ce0c9 Merge pull request #1508 from thaJeztah/update-dockerproject-links 
Update dockerproject.com links
 2015-06-04 11:18:23 -05:00
Aanand Prasad 7d2a89427c Merge pull request #1466 from noironetworks/changing-scale-to-warning 
Modified scale awareness from exception to warning
 2015-06-04 16:21:01 +01:00
Aanand Prasad 036a4c4258 Merge pull request #1507 from albers/completion-version 
Support version command in Bash completion
 2015-06-04 15:46:50 +01:00
Sebastiaan van Stijn cfcc12692f Update dockerproject.com links 
The dockerproject.com domain is moving to dockerproject.org
this changes the buildstatus link to point to the new
domain.

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
 2015-06-03 23:03:17 +02:00
Harald Albers be92b79b42 Support version command in Bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-06-03 13:25:26 -07:00
Aanand Prasad 417e8d80c3 Merge pull request #1499 from sdurrheimer/master 
Support version command in zsh completion
 2015-06-02 15:05:46 +01:00
Steve Durrheimer 77409737ce Support version command in zsh completion 
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
 2015-06-02 12:38:23 +02:00
Aanand Prasad 2594282082 Build Python 2.7.9 in Docker image 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:56:15 +01:00
Aanand Prasad 8ad11c0bc8 Make sure we use Python 2.7.9 and OpenSSL 1.0.1 when building OSX binary 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:57 +01:00
Aanand Prasad c571bb485d Report Python and OpenSSL versions in --version output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-01 17:55:31 +01:00
Aanand Prasad 8eb65ed946 Merge pull request #878 from funkyfuture/versioncmd 
Enhanced version information and Docker-like version command
 2015-06-01 13:36:11 +01:00
Daniel Nephin 9a0bb325f2 Merge pull request #1481 from albers/completion-smart-recreate 
Support --x-smart-recreate in bash completion
 2015-05-30 09:01:39 -05:00
Daniel Nephin d64bf88e26 Merge pull request #1475 from fordhurley/patch-1 
Fix markdown formatting for `--service-ports` example
 2015-05-30 08:43:48 -05:00
Aanand Prasad c8e096e089 Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore 
Make it possible to run tests remotely
 2015-05-29 17:12:57 +01:00
Ben Firshman b638728d6c Merge pull request #1325 from sdurrheimer/master 
Zsh completion for docker-compose
 2015-05-29 14:45:21 +01:00