tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-07-22 21:24:38 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,401 Commits 20 Branches 280 Tags
Commit Graph

1401 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
Ben Firshman
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
Aanand Prasad
b0b6ed31c4 Merge pull request #1430 from albers/fix-1426 
Fix #1426 - migrate_to_labels not found
 2015-05-20 12:31:18 +01:00
lsowen
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
Harald Albers
41315b32cb Fix #1426 - migrate_to_labels not found 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-19 16:37:50 +02:00
Aanand Prasad
80eaf4cc9f Merge pull request #1399 from aanand/state 
Only recreate what's changed
 2015-05-18 19:25:42 +01:00
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
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
Aanand Prasad
4ef3bbcdf2 Merge pull request #1415 from aanand/fix-run-race-condition 
Fix race condition in `docker-compose run`
 2015-05-18 16:16:31 +01:00
Daniel Nephin
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
Daniel Nephin
ed50a0a3a0 Resolves #1066, use labels to identify containers 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:47:26 -04:00
Daniel Nephin
28d2aff8b8 Fix teardown for integration tests. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-05-18 10:44:44 -04:00
Aanand Prasad
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
Daniel Nephin
c8022457eb Merge pull request #1413 from aanand/update-dockerpty 
Update dockerpty to 0.3.3
 2015-05-14 21:23:46 -04:00