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
Aanand Prasad 74a0c47389 Merge pull request #830 from ggtools/cpu_shares 
Add cpu_shares option in fig.yml
 2015-01-12 12:09:08 +00:00
Christophe Labouisse aa0c43df96 Add cpu_shares option in fig.yml 
This options maps exactly the docker run option with the same name.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-11 20:10:48 +01:00
Aanand Prasad 4ef2e21cca Merge pull request #815 from dnephin/fix_the_build 
Fix the failing test
 2015-01-09 12:36:09 +00:00
Daniel Nephin 3ee8437eaa Fix the failing test. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-08 10:55:40 -05:00
Daniel Nephin b903217a4a Merge pull request #544 from LuminosoInsight/external-links 
Allow links to containers outside of the project
 2015-01-08 10:39:00 -05:00
Harald Albers 2406a3936a Documentation for bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-08 15:18:39 +01:00
Harald Albers 69db596b5d Bash completion for fig command 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-08 15:18:39 +01:00
Richard Adams 9a90a27376 be explicit with a ruby version number in the Dockerfile 
Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 19:45:00 +00:00
Aanand Prasad a2f3c0b5da Merge pull request #804 from bfirsh/roadmap-update 
Reorganised roadmap, add high-level goals
 2015-01-07 19:19:45 +00:00
Richard Adams 3b638f0c43 tweaks to the rails tutorial to bring it inline with rail 4.2 release 
Due to a change in Rack, rails server now listens on localhost instead of 0.0.0.0 by default.

Signed-off-by: Richard Adams <richard@madwire.co.uk>
 2015-01-07 17:06:47 +00:00
Ben Firshman b252300e94 Reorganised roadmap, adding high-level goals 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-01-06 15:39:02 +00:00
Daniel Nephin be553e393a Merge pull request #787 from ggtools/patch-1 
Added missing options
 2015-01-05 13:05:48 -05:00
Christophe Labouisse 91c90a722a Added missing options 
The stdin_open and tty options are supported by fig but were missing from the documentation.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-03 23:20:10 +01:00
Ben Firshman d399d386ae Merge pull request #765 from aanand/roadmap 
Docker Compose roadmap
 2014-12-31 19:25:39 +00:00
Daniel Nephin 4cb47e498b Merge pull request #586 from dnephin/speed_up_fig_up 
Speed up fig up
 2014-12-31 14:00:07 -05:00
Daniel Nephin 3056ae4be3 Add a no-build option to fig up, to save time when services were already freshly built. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-12-31 13:47:24 -05:00
Daniel Nephin 5b777ee5f1 Cleanup service unit tests and restructure some service create logic. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-12-31 13:39:41 -05:00
Aanand Prasad c885aaa5f8 ROADMAP.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-12-31 18:10:05 +00:00
Jason Bernardino Alonso 4257707244 Accept an external_links list in the service configuration dictionary to create links to containers outside of the project 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
 2014-12-30 15:31:33 -05:00
Aanand Prasad 70c3676084 Merge pull request #763 from bfirsh/pass-through-detach-to-create-container 
Don't attach stdin and stdout when in detach mode
 2014-12-30 16:05:53 +00:00
Ben Firshman e89826fe43 Don't attach stdin and stdout when in detach mode 
This is primarily to make it work with Swarm, which checks that
AttachStd{in,out,err} is false when creating containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-30 14:13:36 +00:00
Aanand Prasad 0e172228d1 Merge pull request #485 from squebe/run-service-ports 
Added map service ports option for run command.
 2014-12-19 14:17:57 -08:00
Daniel Nephin cb1a5e0a24 Merge pull request #476 from salehe/dns-search 
Add dns_search support in yml config
 2014-12-19 10:00:45 -05:00
Mohammad Salehe 3c105c6db2 Fix typo in dns_search documentation 
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
 2014-12-15 16:37:32 +03:30
Mohammad Salehe 5182bd0968 Add dns_search support in yml config 
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
 2014-12-15 16:37:31 +03:30
Daniel Nephin 200c44cff3 Merge pull request #728 from aanand/volume_test 
Stronger integration test for volume binds
 2014-12-13 12:51:22 -05:00
Aanand Prasad 05544ce241 Stronger integration tests for volume binds 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-12-12 17:53:57 -08:00
Stephen Quebe cc834aa564 Added map service ports option for run command. 
When using the fig run command, ports defined in fig.yml can be mapped
to the host computer using the -service-ports option.

Signed-off-by: Stephen Quebe <squebe@gmail.com>
 2014-12-11 20:30:38 -05:00
Ben Firshman a5505e7711 Merge pull request #721 from dnephin/fix_broken_tests 
Include image name for env_file tests
 2014-12-12 00:46:41 +00:00
Daniel Nephin 8f8e322de2 Include image name for env_file tests. 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 14:25:26 -08:00
Daniel Nephin 64762c9dea Merge pull request #716 from bfirsh/pull-latest-tag-by-default 
Pull latest tag by default
 2014-12-11 15:58:40 -05:00
Ben Firshman 8ebec9a67f Pull latest tag by default 
This was changed in Docker recently:

https://github.com/docker/docker/pull/7759

This means we aren't pulling loads of tags when we only use the
latest.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-11 12:37:04 -08:00
Ben Firshman 45b2712032 Merge pull request #720 from dnephin/upstream_minor_fixes 
Support a timeout on docker client
 2014-12-11 19:28:33 +00:00
Daniel Nephin 3c0f297ba6 Some minor cleanup from yelp/fig 
Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2014-12-11 10:08:39 -08:00
Ben Firshman c0123c7477 Merge pull request #717 from bfirsh/rm-containers-in-scripts 
Remove containers in scripts
 2014-12-10 23:26:51 +00:00
Ben Firshman 2a0782c660 Merge pull request #718 from bfirsh/docker-py-0.6.0 
Upgrade to docker-py 0.6.0
 2014-12-09 22:12:05 +00:00
Daniel Nephin 481a8cb7ab Merge pull request #713 from leishman/add-favicon-headers 
Add favicon.ico and links in header
 2014-12-09 14:29:33 -05:00
Ben Firshman 788741025e Upgrade to docker-py 0.6.0 
Force using remote API version 1.14 so Fig is still compatible with
Docker 1.2.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:57:45 -08:00
Ben Firshman c12d1d73f0 Remove containers in scripts 
So we don't clutter up Docker with loads of stopped containers.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-12-09 10:49:37 -08:00
Ben Firshman e794e79209 Merge pull request #665 from benlangfeld/support-env-file 
Support env file
 2014-12-09 18:42:31 +00:00
Ben Langfeld 98b6d7be78 Add support for 'env_file' key 
Signed-off-by: Ben Langfeld <ben@langfeld.me>
 2014-12-08 23:42:09 +00:00
Ben Firshman a12cf826cd Merge pull request #585 from alunduil/add-tests-to-sdist 
Add tests to sdist.
 2014-12-08 21:34:47 +00:00
Ben Firshman d18cfa1c98 Merge pull request #661 from bfirsh/add-entrypoint-to-dockerfile 
Add fig as entrypoint to Dockerfile
 2014-12-08 21:32:06 +00:00
Ben Firshman 9a04ae0ddf Merge pull request #623 from TFenby/capabilities 
Add capability add/drop introduced in Docker 1.2
 2014-12-08 21:24:02 +00:00
Alexander Leishman ab77cef7ab Add favicon.ico and links in header 
Signed-off-by: Alexander Leishman <leishman3@gmail.com>
 2014-12-08 13:04:02 -08:00
Tyler Fenby 5c58180538 Add capability add/drop introduced in Docker 1.2 
Signed-off-by: Tyler Fenby <tylerfenby@gmail.com>
 2014-12-08 12:32:52 -05:00
Ben Firshman 429a3feabc Merge pull request #699 from dtenenba/master 
interpolate service_name in error message
 2014-12-08 08:49:54 -08:00
Ben Firshman 1033439e63 Merge pull request #701 from bersace/master 
Respect --allow-insecure-ssl option for dependencies
 2014-12-08 08:46:30 -08:00
Ben Firshman e9d946b038 Merge pull request #594 from popox/restart-option 
Add restart option to Fig.
 2014-12-08 08:43:27 -08:00
Étienne BERSAC 4e8337c168 Respect --allow-insecure-ssl option for dependencies 
Signed-off-by: Étienne Bersac <etienne.bersac@novapost.fr>
 2014-12-04 11:45:36 +01:00