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
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
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
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
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
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
95b2eaac04
Merge pull request #1529 from aanand/update-dockerpty
...
Update dockerpty to 0.3.4
2015-06-09 18:21:14 -04:00
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
66af37b135
Merge pull request #1474 from aanand/fix-ssl
...
Fix SSL "CERTIFICATE_VERIFY_FAILED" error
2015-06-09 11:56:27 -04:00
ce880af821
Update dockerpty to 0.3.4
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-08 17:01:03 -04:00
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
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
e2b790f732
Merge pull request #1525 from aanand/fix-duplicate-logging
...
Fix duplicate logging on up/run
2015-06-08 12:48:46 -04:00
b6a7db787f
Remove logging on run --rm
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-08 11:16:00 -04:00
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
f59b43ac27
Fix duplicate logging on up/run
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-08 10:52:15 -04:00
417e6ce0c9
Merge pull request #1508 from thaJeztah/update-dockerproject-links
...
Update dockerproject.com links
2015-06-04 11:18:23 -05:00
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
036a4c4258
Merge pull request #1507 from albers/completion-version
...
Support version command in Bash completion
2015-06-04 15:46:50 +01:00
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
be92b79b42
Support version command in Bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-06-03 13:25:26 -07:00
417e8d80c3
Merge pull request #1499 from sdurrheimer/master
...
Support version command in zsh completion
2015-06-02 15:05:46 +01:00
77409737ce
Support version command in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-06-02 12:38:23 +02:00
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
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
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
8eb65ed946
Merge pull request #878 from funkyfuture/versioncmd
...
Enhanced version information and Docker-like version command
2015-06-01 13:36:11 +01:00
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
d64bf88e26
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
2015-05-30 08:43:48 -05:00
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
b638728d6c
Merge pull request #1325 from sdurrheimer/master
...
Zsh completion for docker-compose
2015-05-29 14:45:21 +01:00
1d5526c71d
Support --x-smart-recreate and -v in zsh completion
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-05-29 14:24:55 +02:00
bc8d5923e7
Zsh completion for docker-compose
...
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-05-29 14:24:55 +02:00
a6bd1d22a0
Don't mount code in a volume when running tests
...
An image is built anyway, so this is unnecessary. This makes it
possible to run the tests on a remote Docker daemon.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-29 13:23:42 +01:00
c128e881c1
Add build and dist to dockerignore
...
These are the bulk of what gets sent in the build. Makes builds
much faster, particularly remotely.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-29 13:07:19 +01:00
a15f996744
Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop
...
Change kill SIGINT test to use SIGSTOP
2015-05-29 12:38:40 +01:00
b3c1c9c954
Support --x-smart-recreate and -v in bash completion
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-29 13:30:01 +02:00
ec437313a7
Change kill SIGINT test to use SIGSTOP
...
I think the original intention of the original test was the check that
different signals work, I think. This does this -- it sends a signal
that doesn't cause the container to stop.
Closes #759 . Replaces #1467 .
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-29 11:13:37 +01:00
5945db0fa8
Fix markdown formatting for `--service-ports` example
...
Signed-off-by: Ford Hurley <ford.hurley@gmail.com>
2015-05-28 15:45:21 -04:00
8574cb67a4
Merge pull request #1471 from aanand/prepare-osx-script
...
Script to prepare OSX build environment
2015-05-28 13:58:14 +01:00
ae9d619d86
Add command for Docker-style version information
...
This adds a command 'version' to show software versions information
like Docker does. In addition it includes:
- version of the docker-py-package
- Python-implementation and -version
Signed-off-by: Frank Sachsenheim <funkyfuture@riseup.net>
2015-05-28 00:51:10 +02:00
7d9aa8e0a9
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 16:27:24 +01:00
d0e87929a1
Merge pull request #1464 from twhiteman/bug1461
...
Possible division by zero error when pulling an image - fixes #1463
2015-05-27 12:49:58 +01:00
ae63d35660
Modified scale awareness from exception to warning
...
Signed-off-by: André Martins <martins@noironetworks.com>
2015-05-26 23:59:45 +01:00
b9c502531d
Possible division by zero error when pulling an image - fixes #1463
...
Signed-off-by: Todd Whiteman <todd.whiteman@joyent.com>
2015-05-26 15:34:34 -07:00
1344099e29
Merge pull request #1444 from aanand/migrate-in-dependency-order
...
Migrate containers in dependency order
2015-05-26 17:30:14 +01:00
48f3d41947
Merge pull request #1447 from aanand/fix-convergence-when-service-not-created
...
Fix regression in `docker-compose up`
2015-05-26 10:54:28 -05:00
7da8e6be3b
Migrate containers in dependency order
...
This fixes a bug where migration would fail with an error if a
downstream container was migrated before its upstream dependencies, due
to `check_for_legacy_containers()` being implicitly called when we fetch
`links`, `volumes_from` or `net` dependencies.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:03:06 +01:00
4795fd874f
Fix regression in `docker-compose up`
...
When an upstream dependency (e.g. a db) has a container but a downstream
service (e.g. a web app) doesn't, a web container is not created on
`docker-compose up`.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 16:01:05 +01:00
276fee105b
Merge pull request #1459 from bfirsh/update-description
...
Update description of Compose
2015-05-26 15:57:26 +01:00
Travis Thieman
Aanand Prasad
Ed Morley
Daniel Nephin
Sebastiaan van Stijn
Harald Albers
Steve Durrheimer
Ben Firshman
Ford Hurley
funkyfuture
André Martins
Todd Whiteman