c3c5d91c47
Merge pull request #1563 from moxiegirl/hugo-test-fixes
...
Hugo final 1.7 Documentation PR -- please read carefully
(cherry picked from commit 4e73e86d94
2015-06-18 11:25:10 -07:00
7fa4cd1214
Merge pull request #1552 from aanand/add-upgrade-instructions
...
Add upgrading instructions to install docs
(cherry picked from commit bc7161b475
2015-06-16 16:29:18 -07:00
f353d9fbc0
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
(cherry picked from commit 5b2a0cc73d
2015-06-15 11:22:08 -07:00
09018855ce
Merge pull request #1550 from aanand/update-docker-py
...
Update setup.py with new docker-py minimum
(cherry picked from commit b3b44b8e4c
2015-06-15 11:22:08 -07:00
719954b02f
Merge pull request #1545 from moxiegirl/test-tooling
...
Updated for new documentation tooling
(cherry picked from commit aaccd12d3d
2015-06-15 11:22:08 -07:00
67bc3fabe4
Merge pull request #1544 from aanand/fix-volume-deduping
...
Fix volume binds de-duplication
(cherry picked from commit 77e594dc94
2015-06-15 11:22:08 -07:00
e724a346c7
Merge pull request #1526 from aanand/remove-start-or-create-containers
...
Remove Service.start_or_create_containers()
(cherry picked from commit 38a11c4c28
2015-06-15 11:22:08 -07:00
87b4545b44
Merge pull request #1508 from thaJeztah/update-dockerproject-links
...
Update dockerproject.com links
(cherry picked from commit 417e6ce0c9
2015-06-15 11:22:07 -07:00
58a7844129
Merge pull request #1482 from bfirsh/add-build-and-dist-to-dockerignore
...
Make it possible to run tests remotely
(cherry picked from commit c8e096e089
2015-06-15 11:22:07 -07:00
4353f7b9f9
Merge pull request #1475 from fordhurley/patch-1
...
Fix markdown formatting for `--service-ports` example
(cherry picked from commit d64bf88e26
2015-06-15 11:22:07 -07:00
8f8693e13e
Merge pull request #1480 from bfirsh/change-sigint-test-to-use-sigstop
...
Change kill SIGINT test to use SIGSTOP
(cherry picked from commit a15f996744
2015-06-15 11:22:07 -07:00
363a6563c7
Merge pull request #1537 from aanand/reorder-service-utils
...
Reorder service.py utility methods
(cherry picked from commit e3525d64b5
2015-06-15 11:22:07 -07:00
59d6af73fa
Merge pull request #1539 from bfirsh/add-image-affinity-to-test
...
Add image affinity to test script
(cherry picked from commit 4c2112dbfd
2015-06-15 11:22:07 -07:00
cd7f67018e
Merge pull request #1466 from noironetworks/changing-scale-to-warning
...
Modified scale awareness from exception to warning
(cherry picked from commit 7d2a89427c
2015-06-15 11:22:07 -07:00
b7e8770c4f
Merge pull request #1538 from thieman/tnt-serivce-misspelled
...
Correct misspelling of "Service" in an error message
(cherry picked from commit bd246fb011
2015-06-15 11:22:07 -07:00
ad4cc5d6df
Merge pull request #1497 from aanand/use-1.7-rc1
...
Run tests against Docker 1.7 RC2
(cherry picked from commit 0e9ccd36f3
2015-06-15 11:22:06 -07:00
ca14ed68f7
Merge pull request #1533 from edmorley/update-b2d-shellinit-example
...
Docs: Update boot2docker shellinit example to use 'eval'
(cherry picked from commit 17e03b29f9
2015-06-15 11:22:06 -07:00
71514cb380
Merge pull request #1531 from aanand/test-crash-resilience
...
Test that data volumes now survive a crash when recreating
(cherry picked from commit 87c30ae6e4
2015-06-15 11:22:06 -07:00
8212f1bd45
Merge pull request #1529 from aanand/update-dockerpty
...
Update dockerpty to 0.3.4
(cherry picked from commit 95b2eaac04
2015-06-09 18:24:14 -04:00
dca3bbdea3
Merge pull request #1527 from aanand/remove-logging-on-run-rm
...
Remove logging on run --rm
(cherry picked from commit 5578ccbb01
2015-06-09 14:39:53 -04:00
8ed7dfef6f
Merge pull request #1525 from aanand/fix-duplicate-logging
...
Fix duplicate logging on up/run
(cherry picked from commit e2b790f732
2015-06-09 14:39:52 -04:00
631f5be02f
Merge pull request #1481 from albers/completion-smart-recreate
...
Support --x-smart-recreate in bash completion
(cherry picked from commit 9a0bb325f2
2015-06-09 14:39:52 -04:00
4f4ea2a402
Merge pull request #1325 from sdurrheimer/master
...
Zsh completion for docker-compose
(cherry picked from commit b638728d6c
2015-06-09 14:39:50 -04:00
5a5bffebd1
Merge pull request #1464 from twhiteman/bug1461
...
Possible division by zero error when pulling an image - fixes #1463
(cherry picked from commit d0e87929a1
2015-06-09 14:39:05 -04:00
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
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
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
686c25d50f
Script to prepare OSX build environment
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-27 17:52:23 +01:00
ef6555f084
Merge branch 'release' into bump-1.3.0
2015-05-26 17:45:28 +01: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
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
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
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
889d3636f4
Merge pull request #1440 from aanand/legacy-fixes
...
Legacy fixes
2015-05-24 12:42:14 -05:00
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
93c529182e
Merge pull request #1446 from aanand/fix-create-logging
...
Fix missing logging on container creation
2015-05-21 17:34:54 -05:00
412034a023
bash completion for migrate-to-labels
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-21 12:45:04 -07:00
30c9e7323a
Fix missing logging on container creation
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-21 20:06:25 +01:00
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
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
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
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
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
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
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
b183a66db1
Merge pull request #1437 from dnephin/fix_project_containers
...
Project.containers with service_names
2015-05-21 10:42:08 +01:00
Aanand Prasad
Daniel Nephin
Ben Firshman
Harald Albers