tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
245 Commits 19 Branches 259 Tags 62 MiB
Commit Graph

245 Commits

Author SHA1 Message Date
Ben Firshman 48eb5e5c82 Merge pull request #40 from orchardup/fix-35 
Make sure attach() is called as soon as LogPrinter is initialized
 2014-01-22 05:14:05 -08:00
Aanand Prasad 65071aafb0 Make sure attach() is called as soon as LogPrinter is initialized 
Fixes #35.
 2014-01-22 13:12:51 +00:00
Ben Firshman 4ee87a7029 Merge pull request #39 from orchardup/fix-cursor-lag 
Fix lag when using cursor keys in an interactive 'fig run'
 2014-01-20 16:12:29 -08:00
Aanand Prasad 977ec7c941 Remove unused import 2014-01-20 19:25:28 +00:00
Aanand Prasad 40d04a076c Fix lag when using cursor keys in an interactive 'fig run' 2014-01-20 19:23:50 +00:00
Ben Firshman 4646ac85b0 Add PyPi badge 2014-01-20 18:41:04 +00:00
Ben Firshman 8773bad99a Merge pull request #34 from orchardup/better-tty-handling-for-fig-run 
Add option to disable pseudo-tty on fig run
 2014-01-20 10:19:13 -08:00
Aanand Prasad 084db337a0 Update docker-py 
Brought in changes from https://github.com/dotcloud/docker-py/pull/145
 2014-01-20 18:09:25 +00:00
Aanand Prasad f47f075f02 Merge pull request #36 from orchardup/use-container-create-for-recreating-containers 
Use Container.create to recreate containers
 2014-01-20 09:59:02 -08:00
Ben Firshman 7abc4fbf3a Improve ps CLI test 2014-01-20 16:50:41 +00:00
Ben Firshman 855a9c623c Remove containers after running CLI tests 2014-01-20 16:47:58 +00:00
Ben Firshman 7e2d86c510 Use Container.create to recreate containers 
self.create_container might do unexpected things.
 2014-01-20 16:10:54 +00:00
Aanand Prasad 405079f744 Use raw socket in 'fig run', simplify _attach_to_container 2014-01-20 15:52:07 +00:00
Ben Firshman fc1bbb45b1 Add option to disable pseudo-tty on fig run 
Also disable tty if stdin is not a tty.
 2014-01-19 20:33:06 +00:00
Ben Firshman 24a6d1d836 Forcibly kill Docker when Travis ends 
May fix tests timing out.
 2014-01-19 20:11:53 +00:00
Ben Firshman f3d273864d Add comments to script/travis 2014-01-19 20:11:53 +00:00
Ben Firshman ce8ef7afe7 Merge pull request #33 from cameronmaske/recreate_containers 
Patch for #32
 2014-01-19 12:11:05 -08:00
Cameron Maske 62bba1684b Updated recreate_containers to attempt to base intermediate container's the previous container's image. 
Added in additional functionality to reset any entrypoints for the intermediate container and pull/retry handling if the image does not exist.
Updated test coverage to check if an container is recreated with an entrypoint it is handled correctly.
 2014-01-19 18:40:21 +00:00
Ben Firshman 07f3c78369 Update docker-py 
From 4bc5d27e51
 2014-01-19 16:50:08 +00:00
Ben Firshman cbfbb9899d Merge pull request #30 from orchardup/ship-0.1.1 
Bump to version 0.1.1
 2014-01-17 11:38:49 -08:00
Ben Firshman b428988ef6 Bump to version 0.1.1 2014-01-17 19:14:48 +00:00
Ben Firshman 4c72598e68 Merge pull request #29 from orchardup/fix-external-port-config 
Fix external port config
 2014-01-17 10:43:54 -08:00
Aanand Prasad c6e19e34f7 Fix external port config 
When exposing a port externally, it seems Docker only actually exposes it
if you specify the *internal* port as `xxxx/tcp`. So add that on if it's
not there.
 2014-01-17 18:01:27 +00:00
Aanand Prasad c0dbb1c2ec Merge pull request #24 from orchardup/travis-pypi-deployment 
Travis PyPi deployment
 2014-01-16 11:12:40 -08:00
Ben Firshman 4bec39535f Remove unnecessary release script 2014-01-16 18:52:15 +00:00
Ben Firshman 7c1ec74cf6 Add Travis PyPi deployment 2014-01-16 18:51:50 +00:00
Ben Firshman 8b77b51c15 Fix travis formatting 
To use formatting travis command line tool uses
 2014-01-16 18:49:15 +00:00
Aanand Prasad 7070e06ac6 Thank some folks 2014-01-16 18:45:38 +00:00
Aanand Prasad 5b9c228cf8 Add note to CHANGES.md about old/new env vars 2014-01-16 18:42:03 +00:00
Ben Firshman 15e8c9ffbb Fix ambiguous order of upgrade instructions 2014-01-16 18:35:41 +00:00
Aanand Prasad caccf96d3f Fix markdown 2014-01-16 18:32:35 +00:00
Ben Firshman 720cc192bb Add upgrade instructions 2014-01-16 18:27:06 +00:00
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