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

695 Commits

Author SHA1 Message Date
Ben Firshman 41ee65b664 Merge branch 'dnephin-replace_packages_with_deps' 
Closes #375
 2014-09-05 11:55:17 -07:00
Daniel Nephin 7fd37c89b9 Remove fig.packages replace with real deps. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-05 11:44:49 -07:00
Aanand Prasad 8d3c9dccc5 Merge pull request #402 from dnephin/fig_ports.rebase 
Fig port command
 2014-09-05 11:09:40 -07:00
Daniel Nephin c48ee5caef Add a new fig command for retrieving the locally bound port of a service. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-09-04 22:09:12 -04:00
Ben Firshman 2827786886 Merge pull request #364 from docker/non-numeric-link-alias 
Non-numeric link alias
 2014-09-04 20:39:18 +01:00
Aanand Prasad 7ad91f3f00 Merge pull request #442 from dnephin/fix_create_container_volumes 
Additional validation for container volumes and ports.
 2014-09-04 12:12:09 -07:00
Daniel Nephin 24044fa704 Some additional validation for container ports, and a couple extra test cases. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:58 -04:00
Daniel Nephin 07fa169fd2 Resolves #260, #301 and #449 
Adds ~ support and ro mode support for volumes, along with some additional validation.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:52 -04:00
Daniel Nephin 8157f0887d Fix the return value of get_tty_width() it should return an int. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-25 22:20:07 -04:00
Aanand Prasad 6dab8c1b89 Merge pull request #420 from bfirsh/inline-installation-commands 
Collapse install instructions into single line
 2014-08-21 17:28:08 -07:00
Ben Firshman 63bd05d40e Collapse install instructions into single line 
For maximum copy and paste happiness

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-18 13:36:37 -07:00
Aanand Prasad dc857a7ad5 Merge pull request #404 from bfirsh/validate-dco 
Validate DCO on Travis
 2014-08-12 11:20:38 -07:00
Ben Firshman aca0e42178 Validate DCO on Travis 
Copied straight from Docker, replacing github.com/docker/docker
with github.com/docker/fig in .validate.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-12 10:58:16 -07:00
Ben Firshman 15037ce0e5 Merge pull request #397 from alunduil/master 
Exclude tests package from installation.
 2014-08-12 18:16:50 +01:00
Aanand Prasad 8eee2bf913 Merge pull request #396 from dnephin/remove_extra_calls 
Remove extra calls, test bug fixes
 2014-08-11 11:54:57 -07:00
Alex Brandt 3965db9dff Exclude tests package from installation. 
Installing the top-level tests package is asking for conflicts with
other python packages and isn't required to run fig.  This simply lets
find_packages know to ignore tests and any sub-packages.
 2014-08-11 09:00:16 -05:00
Daniel Nephin 294453433d Remove extra calls to docker server. 
Fix broken integration tests

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-10 11:24:20 -04:00
Chris Corbyn 22f897ed09 Merge pull request #370 from dnephin/debug_option 
Add a --debug flag for debugging docker calls
 2014-08-10 21:36:17 +10:00
Daniel Nephin df7c2cc43f Resolves #369, add verbose output on --verbose flag 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-09 21:05:54 -04:00
Aanand Prasad f2bf7f9e0d Merge pull request #384 from timfreund/master 
Enable monochrome output in the 'up' and 'logs' commands
 2014-08-08 14:55:31 -07:00
Tim Freund 69c241ba12 Enable monochrome output in the 'up' and 'logs' commands 
Some systems, like Jenkins or other build servers, cannot correctly
render ANSI color codes.  The '--no-color' option enables monochrome
output in the 'up' and 'logs' commands to improve readability in those
systems.

Signed-off-by: Tim Freund <tim@freunds.net>
 2014-08-08 16:15:27 -04:00
Aanand Prasad 59e31ff544 Update docs to remove numeric suffix 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:08:27 -07:00
Aanand Prasad 62a4d214e8 Default link alias which is just the service name 
Closes #37.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:05:42 -07:00
Aanand Prasad 73bd4aca74 Use hostnames everywhere in docs, add YAML note and deprecate env.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 11:58:41 -07:00
Aanand Prasad 342ed948ec Merge pull request #379 from docker/use-library-python-image-for-dockerfile 
Use library python image for dockerfile
 2014-08-07 17:06:38 -07:00
Ben Firshman 3fc7ad3291 Don't use deprecated orchardup/python image 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 16:43:59 -07:00
Aanand Prasad a39460d7b2 Merge pull request #392 from bfirsh/more-official-images 
More official images
 2014-08-07 16:42:36 -07:00
Chris Corbyn 6ab084a338 Merge pull request #390 from bfirsh/remove-integration-tests-from-ci 
Remove integration tests from ci
 2014-08-08 08:37:12 +10:00
Ben Firshman 406425a6b9 Use official images in rails tutorial 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:54:59 -07:00
Chris Corbyn b690b0d20e Merge pull request #387 from dnephin/make_ps_work_on_jekins 
tty width on jenkins
 2014-08-08 07:54:00 +10:00
Ben Firshman 796df302dd Use official images on getting started guide 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:50:55 -07:00
Aanand Prasad 1346805bef Merge pull request #391 from bfirsh/repository-move 
github.com/docker/fig
 2014-08-07 14:49:26 -07:00
Ben Firshman 16744bc78b Switch to official images in readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:48:29 -07:00
Ben Firshman fc3c12ad90 Update repository URL 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:42:49 -07:00
Ben Firshman bbcbe9df9f Upload PyPi package manually 
This never worked properly anyway.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:36:49 -07:00
Ben Firshman 1a240f50ae Remove integration tests from Travis 
Orchard is going away and Travis will be able to run these soon
anyway.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:35:22 -07:00
Ben Firshman 47970761c5 Remove Orchard message from readme 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 14:19:27 -07:00
Aanand Prasad df7bc8cbb8 Merge pull request #389 from orchardup/update-irc-channel 
Update IRC channel to be #docker-fig
 2014-08-07 13:43:12 -07:00
Ben Firshman ba9d744293 Update IRC channel to be #docker-fig 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 13:39:27 -07:00
Aanand Prasad d5854bb625 Merge pull request #388 from orchardup/dockerize 
Point at Docker website and Docker IRC channel
 2014-08-07 10:16:16 -07:00
Ben Firshman e5f7690137 Point at Docker website and Docker IRC channel 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-07 10:15:01 -07:00
Daniel Nephin b0f398caaa Resolves #386, tty width on jenkins 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-07 12:30:01 -04:00
Aanand Prasad 0a15e7fe9c Merge pull request #378 from orchardup/use-ruby-image-for-rails-tutorial 
Use ruby image for rails docs
 2014-08-06 16:51:04 -07:00
Aanand Prasad 255b9419dd Merge pull request #382 from orchardup/use-official-repositories-in-django-example 
Use official images in Django example
 2014-08-06 16:50:45 -07:00
Aanand Prasad c63947b5e2 Merge pull request #383 from orchardup/use-official-repos-on-homepage 
Use official repos on home page
 2014-08-06 16:40:48 -07:00
Ben Firshman b5d1979d58 Use official repos on home page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:33:31 -07:00
Ben Firshman 94aa097bc3 Use official images in Django example 
Much neater.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 16:30:27 -07:00
Aanand Prasad 72ce7ce374 Merge pull request #380 from orchardup/use-hostname-for-redis-on-home-page-example 
Use hostname on home page example
 2014-08-06 16:11:44 -07:00
Ben Firshman 6d64f20ad6 Use hostname on home page example 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 15:53:45 -07:00
Ben Firshman 506f54e9c3 Use ruby image for rails docs 
Fixes #376

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-08-06 13:42:56 -07:00