e5f6ae767d
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
(cherry picked from commit c7dccccd1f
2015-07-16 11:19:21 +01:00
cd44179305
Merge pull request #1705 from aanand/fix-labels-null
...
Handle case where /containers/json returns "Labels": null
(cherry picked from commit 7b9664be8e
2015-07-15 17:33:08 +01:00
4bc4d273ac
Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers
...
Show an error on 'run' when there are legacy one-off containers
(cherry picked from commit 81707ef1ad
2015-07-14 17:29:12 +01:00
4911c77134
Merge pull request #1489 from dnephin/faster_integration_tests
...
Faster integration tests
(cherry picked from commit 5231288b4e
2015-07-14 17:28:54 +01:00
c1b9a76a54
Merge pull request #1658 from aanand/fix-smart-recreate-nonexistent-image
...
Fix smart recreate when 'image' is changed to something nonexistent
(cherry picked from commit 2bc10db545
2015-07-14 17:25:33 +01:00
c31e25af72
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
(cherry picked from commit f42fd6a3ad
2015-07-14 17:25:03 +01:00
c8295d36cc
Merge pull request #1644 from aanand/fix-rm-bug
...
Stop 'rm' and 'ps' listing services not defined in the current file
(cherry picked from commit d85688892c
2015-07-14 17:24:15 +01:00
b12c29479e
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
(cherry picked from commit bc14c473c9
2015-07-14 17:24:15 +01:00
882ef2ccd8
Merge pull request #1578 from aanand/fix-migrate-help
...
Fix 'docker-compose help migrate-to-labels'
(cherry picked from commit c8751980f9
2015-06-21 17:28:18 -07:00
d6cd76c3c1
Merge pull request #1570 from aanand/fix-build-pull
...
Explicitly set pull=False when building
(cherry picked from commit 4f83a18912
2015-06-21 17:28:09 -07:00
bd0be2cdc7
Merge pull request #1580 from aanand/dont-set-network-mode-when-none-is-specified
...
Don't set network mode when none is specified
(cherry picked from commit 911cd60360
2015-06-21 17:27:59 -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
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
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
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
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
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
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
1344099e29
Merge pull request #1444 from aanand/migrate-in-dependency-order
...
Migrate containers in dependency order
2015-05-26 17:30:14 +01: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
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
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
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
022f81711e
Fixes #1434 , Project.containers with service_names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-20 20:47:34 -04:00
ea7ee301c0
Add security_opt as a docker-compose.yml option
...
Signed-off-by: Logan Owen <lsowen@s1network.com>
2015-05-19 13:47:41 -04:00
ef4eb66723
Implement smart recreate behind an experimental CLI flag
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-18 18:39:18 +01:00
62059d55e6
Add migration warning and option to migrate to labels.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:55:12 -04:00
ed50a0a3a0
Resolves #1066 , use labels to identify containers
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:47:26 -04:00
28d2aff8b8
Fix teardown for integration tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-18 10:44:44 -04:00
417d9c2d51
Use individual volumes for recreate instead of volumes_from
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-11 13:01:43 -04:00
df87bd91c8
Added devices configuration option
...
Signed-off-by: Dan Elbert <dan.elbert@gmail.com>
2015-05-11 10:50:58 -05:00
6829efd4d3
Resolves #874 , Rename instead of use an intermediate.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-07 21:53:41 -04:00
0f2f9db6d8
Merge pull request #1388 from vdemeester/1303-log-driver-support
...
Add support for log-driver as a docker-compose.yml option
2015-05-07 12:00:42 -04:00
f626fc5ce8
Add support for log-driver in docker-compose.yml
...
Closes #1303
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2015-05-06 13:18:58 +02:00
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
4bce388b51
Merge pull request #1376 from aanand/fix-build-non-ascii-filename
...
Make sure the build path we pass to docker-py is a binary string
2015-04-30 20:54:21 -04:00
6c95eed781
Merge pull request #1269 from aanand/labels
...
Implement 'labels' option
2015-04-30 20:49:11 -04:00
4f366d8355
Make sure the build path we pass to docker-py is a binary string
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-30 11:57:46 +01:00
7e0ab0714f
Merge pull request #1344 from dnephin/fix_pull_with_sha
...
Support image with ids instead of names
2015-04-29 16:46:34 +01:00
2e6bc078fb
Implement 'labels' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 16:45:18 +01:00
3dd860f0ba
Fix #923 , support image with ids instead of names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-04-29 10:13:18 -04:00
16f8106149
Merge pull request #1158 from chernjie/addhosts
...
Add extra_hosts to yml configuration --add-hosts
2015-04-27 12:26:29 +01:00
688f82c1cf
Add cpuset config.
...
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-04-26 00:14:52 +08:00
a631c1eddb
Merge pull request #1357 from turtlemonvh/1350-extends_parent_build_directory_dne_error
...
Fix for #1350 , nonexisting build path in parent section causes extending section to fail
2015-04-27 13:49:01 -04:00
855855a0e6
Fix for #1350 , nonexisting build path in parent section causes extending section to fail
...
Signed-off-by: Timothy Van Heest <timothy.vanheest@gmail.com>
2015-04-27 10:55:30 -04:00
89789c54ad
Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files
...
Add parent directories search for default compose-files
2015-04-24 13:12:24 -04:00
Mazz Mosley
Aanand Prasad
Ben Firshman
Daniel Nephin
lsowen
delbert@umn.edu
Vincent Demeester
CJ
xuxinkun
Timothy Van Heest