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
00f61196a4
Bump 1.3.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-06-18 11:25:10 -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
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
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
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
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
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
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
276fee105b
Merge pull request #1459 from bfirsh/update-description
...
Update description of Compose
2015-05-26 15:57:26 +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
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
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
022f81711e
Fixes #1434 , Project.containers with service_names.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-05-20 20:47:34 -04:00
f5ac1fa073
Remove whitespace from json hash
...
Reasoning:
e5d8447f06 (commitcomment-11243708)
2015-05-20 16:02:08 +01:00
f79eb7b9ad
Merge pull request #1382 from lsowen/security_opt
...
Add security_opt as a docker-compose.yml option
2015-05-20 13:40:42 +01: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
41315b32cb
Fix #1426 - migrate_to_labels not found
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-05-19 16:37:50 +02: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
82bc7cd5ba
Remove override_options arg from recreate_container(s)
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-18 17:42:09 +01:00
3304c68891
Only set AttachStdin/out/err for one-off containers
...
If we're just streaming logs from `docker-compose up`, we don't need
to set AttachStdin/out/err, and doing so results in containers with
different configuration depending on whether `up` or `run` were invoked
with `-d` or not.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-18 17:41:04 +01:00
1e6d912fbc
Merge pull request #1356 from dnephin/use_labels_instead_of_names
...
Use labels instead of names to identify containers
2015-05-18 17:38:46 +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
862971cffa
Fix race condition in `docker-compose run`
...
We shouldn't start the container before handing it off to dockerpty -
dockerpty will start it after attaching, which is the correct order.
Otherwise the container might exit before we attach to it, which can
lead to weird bugs.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-05-15 12:16:24 +01: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
7fb9ec29c4
Merge pull request #1335 from chernjie/pid_readonly
...
docker-compose create --readonly
2015-05-05 20:50:01 -04:00
b06294399a
See #1335 : Added --read-only
...
Signed-off-by: CJ <lim@chernjie.com>
2015-05-02 23:39:39 +08:00
b8e0aed21c
Show proper command in help text of build subcommand
...
The help text of the build subcommand suggested to use 'compose build' (instead of 'docker-compose build') to rebuild images.
Signed-off-by: Simon Herter <sim.herter@gmail.com>
2015-05-01 18:58:55 -04: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
1a77feea3f
Close connection before attaching on 'up' and 'run'
...
This ensures that the connection is not recycled, which can cause the
Docker daemon to complain if we've already performed another streaming
call such as doing a build.
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-29 18:42:03 +01:00
Aanand Prasad