tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 05:04:27 +02:00
Code Issues Packages Projects Releases Wiki Activity
5,517 Commits 20 Branches 280 Tags
Commit Graph

5517 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
Aanand Prasad
8749bc0844 Build Python 2.7.9 in Docker image 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-06-02 11:39:17 +01:00
Aanand Prasad
f3d0c63db2 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-02 11:39:17 +01:00
Aanand Prasad
93a846db31 Report Python and OpenSSL versions in --version output 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>

Conflicts:
	compose/cli/utils.py
 2015-06-02 11:39:17 +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