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

985 Commits

Author SHA1 Message Date
Aanand Prasad 43fdae8bc6 Ship 1.1.0-rc1 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 22:42:59 +00:00
Aanand Prasad 4869fed97f Merge pull request #835 from aanand/rebrand 
Rebrand (pre-RC)
 2015-01-20 22:24:21 +00:00
Aanand Prasad 16d6018419 Fix typos 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:28:49 +00:00
Aanand Prasad 8297f55f2c Remove all website-related stuff from docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 724be54f09 Manual fixes to docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad e3c4a662d9 Find-and-replace on docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad c981ce929a Update README.md, ROADMAP.md and CONTRIBUTING.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 620e29b63f Rename binary to docker-compose and config file to docker-compose.yml 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 2af7693e64 WIP: rename Fig to Compose 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 21:00:23 +00:00
Aanand Prasad 7be8b4c06d Merge pull request #851 from aanand/swarm-names 
Handle Swarm-style prefixed container names
 2015-01-20 20:51:47 +00:00
Aanand Prasad cbd3ca07c4 Handle Swarm-style prefixed names in Container.from_ps() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad edb6b24b8f Handle Swarm-style prefixed names in Service.containers() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad 608f29c7cb Unit tests for Service.containers() and get_container_name() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:38:06 +00:00
Aanand Prasad 37ed743ee8 Merge pull request #859 from aanand/test-image-volumes 
Test for preservation of volumes declared in images
 2015-01-20 20:26:40 +00:00
Aanand Prasad 17a8a7be4b (Failing) test for preservation of volumes declared in images 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-20 20:16:18 +00:00
Aanand Prasad f57db078ba Merge pull request #863 from dnephin/revert_volume_recreate_changes 
Revert #711 from dnephin/fix_volumes_on_recreate
 2015-01-20 20:15:17 +00:00
Daniel Nephin 2dd1cc80ca Revert "Merge pull request #711 from dnephin/fix_volumes_on_recreate" 
This reverts commit 55095ef488, reversing
changes made to 72095f54b2.

Signed-off-by: Daniel Nephin <dnephin@yelp.com>
 2015-01-20 12:03:03 -08:00
Aanand Prasad 55095ef488 Merge pull request #711 from dnephin/fix_volumes_on_recreate 
Fix volumes on recreate
 2015-01-15 18:53:48 +00:00
Daniel Nephin 7eb476e61d Resolves #447, fix volume logic for recreate container 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-14 16:20:59 -05:00
Aanand Prasad 72095f54b2 Merge pull request #639 from albers/bash-completion 
Bash completion for fig command
 2015-01-13 17:46:42 +00:00
Daniel Nephin 26f45efea2 Remove unused intermediate_container from return value. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-12 22:16:54 -08:00
Aanand Prasad 4827e60641 Merge pull request #568 from Aigeruth/fix/project_name 
Convert project_name to lowercase
 2015-01-12 16:23:09 +00:00
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