tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
963 Commits 25 Branches 263 Tags 66 MiB
Commit Graph

963 Commits

Author SHA1 Message Date
Ben Firshman 573fae089f Add missing files to manifest 2014-01-16 18:21:56 +00:00
Ben Firshman 83cd16e373 Merge pull request #22 from orchardup/ship-0.1.0 
Ship 0.1.0
 2014-01-16 10:19:44 -08:00
Aanand Prasad 74fb400fef Version 0.1.0 2014-01-16 18:18:01 +00:00
Ben Firshman a07b00606b Fix typos in manifest 2014-01-16 18:17:16 +00:00
Ben Firshman 65f23583ae Ignore vim undo files 2014-01-16 18:16:26 +00:00
Aanand Prasad c8a58f2547 Merge pull request #23 from orchardup/add-scale-command 
Add scale command
 2014-01-16 10:14:39 -08:00
Ben Firshman 56c6efdfce Add scale command 
Closes #9
 2014-01-16 18:09:46 +00:00
Ben Firshman 8ed86ed551 Add number to container 2014-01-16 18:05:59 +00:00
Aanand Prasad d2f4c81d62 Merge pull request #21 from orchardup/add-basic-dockerfile 
Add basic Dockerfile
 2014-01-16 09:44:44 -08:00
Ben Firshman b20190da98 Add basic Dockerfile 
Because.
 2014-01-16 17:28:47 +00:00
Ben Firshman 5d9a5a0c84 Merge pull request #20 from orchardup/travis-just-uses-socket 
Travis runs Docker just on the Unix socket, not on TCP
 2014-01-16 09:15:40 -08:00
Aanand Prasad bb7613f37b Travis runs Docker just on the Unix socket, not on TCP 2014-01-16 17:03:56 +00:00
Aanand Prasad 9bd54d7be2 Merge pull request #19 from orchardup/use-docker-host-variable 
Use DOCKER_HOST environment variable to find Docker daemon
 2014-01-16 09:03:37 -08:00
Aanand Prasad 5c8fac5993 Merge pull request #18 from orchardup/shorten-long-commands-in-ps 
Shorten long commands in ps
 2014-01-16 08:47:25 -08:00
Aanand Prasad 3e2fd6a2a1 Use DOCKER_HOST environment variable to find Docker daemon 
Removed all "smart" connection logic. Fig either uses the DOCKER_HOST
environment variable if it's present, or passes `None` to docker-py,
which does the "right thing" (i.e. falls back to the Unix socket).

This means we no longer know at URL-deciding time whether we can connect
to the Docker daemon, so we wrap `dispatch` in a `try/except` which
catches `requests.exceptions.ConnectionError`.
 2014-01-16 16:40:55 +00:00
Ben Firshman f36dd414a0 Merge pull request #10 from orchardup/use-regular-attach 
LogPrinter uses regular attach(), not websocket
 2014-01-16 08:27:48 -08:00
Aanand Prasad af1b0ed088 Account for length of the ellipsis string when truncating commands 2014-01-16 14:07:17 +00:00
Aanand Prasad feafea2c6d LogPrinter uses regular `attach()`, not websocket 
Fixes #7.
 2014-01-16 14:04:10 +00:00
Ben Firshman c4f5ed839f Shorten long commands in ps 2014-01-16 14:02:52 +00:00
Ben Firshman b4c905dc83 Merge pull request #14 from orchardup/vendor-docker-py 
Vendor docker-py
 2014-01-16 05:49:15 -08:00
Aanand Prasad 804e2cdcb1 Merge pull request #16 from orchardup/add-help-command 
Add help command
 2014-01-16 05:40:48 -08:00
Aanand Prasad 0bb5e48f53 Merge pull request #15 from orchardup/copy-readme-command-docs-to-docstrings 
Copy readme commands docs to CLI docstrings
 2014-01-16 05:40:43 -08:00
Aanand Prasad 21528f08d4 Vendor docker-py 
From 9dc03c5737
 2014-01-16 13:30:01 +00:00
Ben Firshman b1e7f548f4 Add help command 2014-01-16 13:26:25 +00:00
Ben Firshman cdcea98290 Copy readme commands docs to CLI docstrings 2014-01-16 13:17:00 +00:00
Ben Firshman c06456da37 Merge pull request #13 from orchardup/recreate-containers 
Recreate containers on each `fig up`
 2014-01-16 04:57:48 -08:00
Aanand Prasad 7b31fdf6f6 Clarify that volumes are preserved when recreating containers 2014-01-16 12:42:07 +00:00
Aanand Prasad e38b403b14 Update README for new 'fig up' behaviour 2014-01-16 12:32:16 +00:00
Aanand Prasad ee0c4bf690 Fix test regression 2014-01-16 12:32:16 +00:00
Aanand Prasad 8c583d1bb2 Quieter log output when recreating 
Moved log stuff to Service, which I think makes more sense anyway.
Maybe.
 2014-01-16 12:32:16 +00:00
Aanand Prasad ea4753c49a Use an anonymous intermediate container so that when recreating containers, suffixes always start from 1 2014-01-16 12:32:15 +00:00
Aanand Prasad 3956d85a8c Refactor recreate_containers() in preparation for smart name-preserving logic 2014-01-16 12:32:15 +00:00
Aanand Prasad 8a0071d9c1 Reduce stop() timeout when recreating containers 2014-01-16 12:32:15 +00:00
Aanand Prasad 5db6c9f51b Rework 'fig up' to use recreate_containers() 2014-01-16 12:32:15 +00:00
Aanand Prasad f5f9357736 Remove project.create_containers(), revamp project.recreate_containers() 
`recreate_containers` now returns two lists of old+new containers, along
with their services.
 2014-01-16 12:32:15 +00:00
Aanand Prasad bdc6b47e1f service.recreate_containers() no longer removes the old containers 
We need to keep them around until the new ones have been started.
 2014-01-16 12:32:15 +00:00
Aanand Prasad 3669236aa1 Support volumes in config with an unspecified host path 2014-01-16 12:32:15 +00:00
Aanand Prasad 207e83ac2f Be sure to test that recreate_containers updates config 2014-01-16 12:32:15 +00:00
Ben Firshman 3c5e334d9d Add recreate_containers method to service 2014-01-16 12:32:15 +00:00
Aanand Prasad a8e275a432 Implement UserError __unicode__ method 2014-01-16 12:32:04 +00:00
Aanand Prasad 887a30e327 Clarify when 'fig stop' is necessary in README 2014-01-16 12:07:18 +00:00
Ben Firshman 7a1fb3a8d2 Fix ordering of port mapping 2014-01-16 01:54:05 +00:00
Ben Firshman d4000e07a9 Switch order of connection logic so TCP is tried first 2014-01-16 00:58:46 +00:00
Aanand Prasad a3d024e11d Larger gif in README 2014-01-14 19:19:15 +00:00
Aanand Prasad b92e998929 'fig logs' shows output for stopped containers 2014-01-14 12:42:30 +00:00
Ben Firshman f448a841c5 New docker-osx installation instructions 2014-01-12 16:58:50 +00:00
Ben Firshman c9c844c279 Print commands travis scripts are running 2014-01-11 14:53:07 +00:00
Ben Firshman 342f187318 Put python egg cache in a writeable dir 2014-01-11 14:52:37 +00:00
Ben Firshman d063f0e00c Add back missing compat module 2014-01-11 14:31:56 +00:00
Ben Firshman 0614e2c590 Use Docker 0.7.5 on Travis 2014-01-11 14:31:47 +00:00