1616 Commits

Author SHA1 Message Date
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
Steve Durrheimer
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
Steve Durrheimer
bc8d5923e7 Zsh completion for docker-compose
Signed-off-by: Steve Durrheimer <s.durrheimer@gmail.com>
2015-05-29 14:24:55 +02:00
Ben Firshman
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
Ben Firshman
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
Aanand Prasad
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
Harald Albers
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
Ben Firshman
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
Ford Hurley
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
Ben Firshman
8574cb67a4 Merge pull request #1471 from aanand/prepare-osx-script
Script to prepare OSX build environment
2015-05-28 13:58:14 +01:00
funkyfuture
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
Aanand Prasad
7d9aa8e0a9 Script to prepare OSX build environment
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 16:27:24 +01:00
Aanand Prasad
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
André Martins
ae63d35660 Modified scale awareness from exception to warning
Signed-off-by: André Martins <martins@noironetworks.com>
2015-05-26 23:59:45 +01:00
Todd Whiteman
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
Aanand Prasad
1344099e29 Merge pull request #1444 from aanand/migrate-in-dependency-order
Migrate containers in dependency order
2015-05-26 17:30:14 +01:00
Daniel Nephin
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
276fee105b Merge pull request #1459 from bfirsh/update-description
Update description of Compose
2015-05-26 15:57:26 +01:00
Ben Firshman
8af4ae7935 Merge pull request #1441 from aanand/abort-on-legacy-containers
Bail out immediately if there are legacy containers
2015-05-26 15:45:08 +01:00
Ben Firshman
91ceb33d5a Update description of Compose
"Define and run multi-container applications with Docker"

Not just development environments, and "complex" is not clear and
not really true.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-26 15:42:55 +01:00
Aanand Prasad
0b4d9401ee Bail out immediately if there are legacy containers
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-26 11:53:51 +01:00
Daniel Nephin
889d3636f4 Merge pull request #1440 from aanand/legacy-fixes
Legacy fixes
2015-05-24 12:42:14 -05:00
Daniel Nephin
b0f945d2da Merge pull request #1432 from albers/completion-migrate_to_labels
bash completion for migrate_to_labels
2015-05-23 18:21:44 -05:00
Daniel Nephin
93c529182e Merge pull request #1446 from aanand/fix-create-logging
Fix missing logging on container creation
2015-05-21 17:34:54 -05:00
Harald Albers
412034a023 bash completion for migrate-to-labels
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-21 12:45:04 -07:00
Aanand Prasad
30c9e7323a Fix missing logging on container creation
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 20:06:25 +01:00
Aanand Prasad
051f56a1e6 Fix bugs with one-off legacy containers
- One-off containers were included in the warning log messages, which can
  make for unreadable output when there are lots (as there often are).

- Compose was attempting to recreate one-off containers as normal
  containers when migrating.

Fixed by implementing the exact naming logic from before we used labels.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:49 +01:00
Aanand Prasad
b5ce23885b Split out fetching of legacy names so we can test it
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:49 +01:00
Aanand Prasad
0fdb8bf814 Refactor migration logic
- Rename `migration` module to `legacy` to make its legacy-ness explicit

- Move `check_for_legacy_containers` into `legacy` module

- Fix migration test so it can be run in isolation

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 18:21:09 +01:00
Aanand Prasad
e538923545 Merge pull request #1442 from aanand/dashes-in-migration-command
Rename migrate_to_labels -> migrate-to-labels
2015-05-21 18:19:30 +01:00
Daniel Nephin
c0f65a9f4c Merge pull request #1445 from aanand/replace-sleep-with-top
Use 'top' instead of 'sleep' as a dummy command
2015-05-21 11:51:23 -05:00
Aanand Prasad
b0cb31c186 Use 'top' instead of 'sleep' as a dummy command
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 16:24:29 +01:00
Aanand Prasad
3080244c0b Rename migrate_to_labels -> migrate-to-labels
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 14:54:41 +01:00
Aanand Prasad
b183a66db1 Merge pull request #1437 from dnephin/fix_project_containers
Project.containers with service_names
2015-05-21 10:42:08 +01:00
Daniel Nephin
022f81711e Fixes #1434, Project.containers with service_names.
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-20 20:47:34 -04:00
Aanand Prasad
4f40d0c168 Merge pull request #1433 from bfirsh/remove-whitespace-from-json-representation-of-container-config
Remove whitespace from json hash
2015-05-20 16:55:02 +01:00
Ben Firshman
f5ac1fa073 Remove whitespace from json hash
Reasoning:

e5d8447f06 (commitcomment-11243708)

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2015-05-20 16:02:08 +01:00