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

471 Commits

Author SHA1 Message Date
Ben Firshman c3c8395cef Merge pull request #215 from marksteve/docker-0.11 
Docker 0.11
 2014-05-08 10:10:19 +01:00
Mark Steve Samson 38c008e527 Fix index error when getting ghost state of containers 2014-05-08 12:39:15 +08:00
Aanand Prasad a3d8f7d113 Remove hash from gif URL 2014-05-06 17:13:56 +01:00
Ben Firshman 65a642097c Merge pull request #211 from servebox/project-name 
Add the ability to configure the project name using a command line option
 2014-05-05 10:50:48 +01:00
Ben Firshman dff9aa6f0c Add installation and entrypoint to dockerfile 2014-05-05 10:50:23 +01:00
Ben Firshman ab145b5365 Fix pull requests failing on travis 2014-05-05 10:50:10 +01:00
Jef Mathiot 5878fe3834 Add the ability to configure the project name 2014-05-02 18:00:58 +02:00
Aanand Prasad 715e29d7ba Merge pull request #207 from orchardup/fig-run-correct-exit-code 
Return correct exit code from fig run
 2014-05-01 18:21:40 +01:00
Ben Firshman 983337401c Return correct exit code from fig run 
Closes #197
 2014-05-01 18:17:12 +01:00
Ben Firshman 8251dec587 Add docs, build and dist to clean script 2014-05-01 17:17:23 +01:00
Ben Firshman 52f994cf04 Remove /docs/.git-gh-pages from gitignore 
It's inside /docs/_site
 2014-05-01 17:17:06 +01:00
Ben Firshman 3d4b5cfbfe Update version of docker-osx 2014-05-01 15:34:21 +01:00
Aanand Prasad 33b057bfaf Update tag in docker-osx download URL 2014-05-01 10:51:42 +01:00
Aanand Prasad 629fe771df Update domain in docker-osx download URL 2014-04-30 16:37:20 +01:00
Aanand Prasad 5e6f175b5f Update download URLs on install page 2014-04-30 16:26:46 +01:00
Aanand Prasad 6dc1a404d5 Merge pull request #202 from orchardup/ship-0.4.0 
Ship 0.4.0
 2014-04-30 14:04:56 +01:00
Aanand Prasad d1d4f47764 Ship 0.4.0 2014-04-30 11:53:39 +01:00
Aanand Prasad 3abce4259f Fix regression in handling of build errors 2014-04-30 11:53:23 +01:00
Aanand Prasad c78b952c3d Merge pull request #201 from orchardup/better-log-printing 
Better log printing
 2014-04-29 10:57:56 +01:00
Ben Firshman fff5e51426 Make log messages line up with each other 2014-04-29 09:31:57 +01:00
Ben Firshman a724aa5717 Use name without project for log printing 2014-04-29 09:22:20 +01:00
Ben Firshman 10725136d8 Add tests for names on containers 2014-04-29 09:20:29 +01:00
Aanand Prasad 8f1793dd06 Merge pull request #186 from orchardup/update-docker-py-7f55a101f813f3e96413d1b577e98d9467b0bffc 
WIP: Docker >=0.9 support, docker-py 0.3.1
 2014-04-28 18:51:38 +01:00
Aanand Prasad fd85be2c9e Update docker[-osx] version in install docs 2014-04-28 18:22:11 +01:00
Ben Firshman 24959209cc Update build status badge 2014-04-25 23:33:25 +01:00
Ben Firshman 29c9763feb Use Orchard to run integration tests 2014-04-25 23:24:05 +01:00
Ben Firshman ca7151aeb1 Split tests into unit and integration 2014-04-25 22:58:21 +01:00
Aanand Prasad 6e932794f7 Fix regression when mounting volumes 
Caused by
77fec67c60
 2014-04-25 12:28:00 +01:00
Aanand Prasad 9e1dfcfb37 Update docker-py APIError imports 2014-04-23 18:20:33 +01:00
Aanand Prasad 5166b2c1a8 Update docker-py 
Using commit:
b31bb4d879
 2014-04-23 18:16:35 +01:00
Aanand Prasad 80991f1521 Set "VolumesFrom" when starting containers 
This is necessary when working with Docker 0.10.0 and up. Fortunately,
we can set it both when creating and starting, and retain compatibility
with 0.8.x and 0.9.x.

recreate_containers() is now responsible for starting containers, as
well as creating them. This greatly simplifies usage of the Service
class.
 2014-04-23 15:46:26 +01:00
Ben Firshman b752a86589 Merge pull request #193 from damm/fix_scripts_build_linux 
Ensure that `pwd`/dist exists and is writeable
 2014-04-16 08:07:32 +01:00
Scott M. Likens c2acceba4e Ensure `pwd`/dist exists always and is 777. 
Fixes #192

Signed-off-by: Scott M. Likens <scott@likens.us>
 2014-04-16 00:15:25 +00:00
Aanand Prasad f8ee52ca2a Fix build output 
docker-py now streams us the raw JSON events, so we have to replicate
the Docker client's progress logic.

On the bright side, we now have well-behaved progress bars when pulling
an image during `fig build` (no more ski slopes) and `fig up` (no more
silence).
 2014-04-15 10:41:06 +01:00
Ben Firshman 2b245bdf9e Update to docker-py 0.3.1 
From 7f55a101f8

This now requires Docker 0.9 or greater.
 2014-04-15 10:41:06 +01:00
Ben Firshman d7e01a23f8 Merge pull request #191 from orchardup/fix-one-off-containers-not-linking-to-service 
Fix one-off containers not linking to service
 2014-04-15 10:40:37 +01:00
Ben Firshman 4e20be9c66 Remove unused imports 2014-04-14 22:39:49 +01:00
Ben Firshman 94e15a9985 Fix one-off containers not linking to service 
Closes #185.

Need to test this more thoroughly. We need a docker-py mock.
 2014-04-14 22:29:03 +01:00
Ben Firshman 5061875fa9 Merge pull request #188 from shanejonas/fix/utf8-encoding 
fix issue with utf8 encoding in logger stdout
 2014-04-14 22:17:14 +01:00
Shane Jonas d9782b2dd1 fix issue with utf8 encoding in logger stdout 2014-04-11 11:21:20 -07:00
Ben Firshman 530afba5cb Merge pull request #150 from muff1nman/utf8 
Jekyll errors out with utf8 input
 2014-04-06 16:01:32 +01:00
Aanand Prasad 4a90a7691b Merge pull request #180 from orchardup/better-error-message-for-broken-links 
Improve error message when link does not exist
 2014-04-05 17:29:08 +01:00
Ben Firshman 050f81e37c Improve error message when link does not exist 2014-04-04 13:06:52 +01:00
Ben Firshman aecaf665f1 Merge pull request #164 from orchardup/friendlier-build-error 
Friendlier build error
 2014-03-28 23:05:46 +00:00
Ben Firshman 23a8938809 Merge pull request #165 from orchardup/number-one 
Stop 'fig up' when a container exits
 2014-03-28 23:03:00 +00:00
Ben Firshman 641c773476 Merge pull request #173 from colinmccune/master 
Fixes the mac build script so it wont fail when the venv folder doesn't exist
 2014-03-28 22:56:17 +00:00
Colin McCune 97be5b4cfb Updates the mac build script so it wont fail when the venv folder does not exist. 2014-03-27 20:22:05 -04:00
Aanand Prasad 76b7d0095d Merge pull request #171 from orchardup/scaling-down-removes-containers 
Scaling down removes containers
 2014-03-27 12:23:04 +00:00
sebastianneubauer 352ad7a38c Scaling down removes containers 
Squashed version of #162.
Closes #121.
 2014-03-26 18:28:10 +00:00
Aanand Prasad 401ea4e7a8 Merge pull request #166 from orchardup/utf8-fixes 
Fix UnicodeEncodeErrors in output of 'build', 'run' and 'up'
 2014-03-25 13:43:50 +00:00