27bd987f28
Add test for trailing slash volume copying bug
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-30 10:31:54 +01:00
9768872507
Fix "Duplicate volume mount" error when config has trailing slashes
...
When an image declares a volume such as `/var/lib/mysql`, and a Compose
file has a line like `./data:/var/lib/mysql/` (note the trailing slash),
Compose creates duplicate volume binds when *recreating* the container.
(The first container is created without a hitch, but contains multiple
entries in its "Volumes" config.)
Fixed by normalizing all paths in volumes config.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 18:42:08 +01:00
118a389646
Update API version to 1.19
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-29 15:44:21 +01:00
65cc84140a
Merge pull request #1736 from aanand/deprecate-allow-insecure-ssl
...
Deprecate --allow-insecure-ssl
2015-07-23 14:09:17 +01:00
70c7d27c4e
Merge pull request #1758 from mnowster/improve-scale-test-coverage
...
Improve scale test coverage
2015-07-23 11:07:48 +01:00
04a773f1c8
Deprecate --allow-insecure-ssl
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-23 10:56:21 +01:00
119901c19b
Improve test coverage for scale
...
Also includes tiny amount of code cleanup, being explicit with imports.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-23 10:55:57 +01:00
1739448402
Don't use custom name for one-off containers
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-22 15:39:56 +01:00
a3191ab90f
Add container_name option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 15:50:09 +01:00
ced94a3504
Make smart recreate the default
...
Add --force-recreate flag to enable the old default behaviour of
recreating everything.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-17 11:28:02 +01:00
c7dccccd1f
Merge pull request #1704 from aanand/fix-timeout-type
...
Make sure up/restart/stop timeout is an int
2015-07-16 10:50:06 +01:00
0c5c8d1f00
Handle case where /containers/json returns "Labels": null
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 17:13:33 +01:00
ec8bf066ba
Make sure up/restart/stop timeout is an int
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-15 16:56:39 +01:00
81707ef1ad
Merge pull request #1643 from aanand/warn-about-legacy-one-off-containers
...
Show an error on 'run' when there are legacy one-off containers
2015-07-08 14:48:03 +01:00
531265bc84
Fix smart recreate when 'image' is changed to something nonexistent
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-07 16:01:44 +01:00
e98caf5cf9
Show an error on 'run' when there are legacy one-off containers
...
Also warn the user about the one-off containers in the standard error
message about legacy containers.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-06 14:45:17 +01:00
fc8f564558
Merge pull request #1632 from mnowster/extends_file_default_behaviour
...
Extends file default behaviour and fixes circular reference bug
2015-07-06 13:28:54 +01:00
f42fd6a3ad
Merge pull request #1642 from aanand/fix-1573
...
Fix bug where duplicate container is leftover after 'up' fails
2015-07-03 16:25:53 +01:00
317bbec98c
Move make_service_dict out of config
...
This top level function is a test helper, so I've moved it into the
config_test file and updated accordingly.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-07-03 15:06:53 +01:00
0b887b841f
Stop 'rm' and 'ps' listing services not defined in the current file
...
If you have an alternate YAML file with different services defined,
containers for those services will be shown in `docker-compose ps` even
if you don't pass that file in.
Furthermore, `docker-compose rm` will claim that it's going to remove
them, but actually won't.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-03 14:34:27 +01:00
62b47224f0
Fix bug where duplicate container is leftover after 'up' fails
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-07-03 10:46:07 +01:00
ae96fc0071
Support reading config from stdin.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-07-02 22:16:22 -04:00
77c939b256
Merge pull request #1142 from calou/master
...
Added support of option mac-address
2015-06-17 14:39:00 -07:00
b76ac6e633
Added support to option mac-address
...
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Updated doc
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Fixed LINT errors
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed mac-address entry order in config keys
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
Changed attributes order in docs/yml.md
Signed-off-by: Sébastien Gruchet <gruchet@gmail.com>
2015-06-17 21:28:17 +02:00
bc14c473c9
Merge pull request #1521 from dano/validate-service-names
...
Validate that service names passed to Project.containers aren't bogus.
2015-06-16 10:45:49 -07:00
5b2a0cc73d
Merge pull request #1406 from vdemeester/667-compose-port-scale
...
Fixing docker-compose port with scale (#667 )
2015-06-15 10:58:44 -07:00
06db577105
Move converge() to a test module, and use a short timeout for tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 17:18:27 -04:00
c24d5380e6
Extend up -t to pass timeout to stop running containers
...
Signed-off-by: Travis Thieman <travis.thieman@gmail.com>
2015-06-14 16:45:28 -04:00
60351a8e07
Speed up integration test and make cleanup easier by using labels
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 16:45:28 -04:00
d827809ffb
Use labels to filter containers.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-06-14 16:45:28 -04:00
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
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
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
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
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
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
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
ae63d35660
Modified scale awareness from exception to warning
...
Signed-off-by: André Martins <martins@noironetworks.com>
2015-05-26 23:59:45 +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
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
Aanand Prasad
Mazz Mosley
Mazz Mosley
Daniel Nephin
Sébastien Gruchet
Travis Thieman
Vincent Demeester
Dan O'Reilly
Ben Firshman
André Martins
lsowen