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

920 Commits

Author SHA1 Message Date
Ben Firshman 0fa0131372 Add script which runs Fig inside Docker 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-20 14:33:15 +00:00
Aanand Prasad 64239f1408 Merge pull request #950 from aanand/update-pep8 
Update pep8, fix errors and freeze requirements-dev.txt
 2015-02-11 21:33:14 +00:00
Aanand Prasad c39a0b0a2d Update pep8, fix errors and freeze requirements-dev.txt 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-11 19:00:13 +00:00
Fred Lifton 8a7b3fb0eb Merge pull request #922 from aanand/tweak-intro 
Tweak intro
 2015-02-09 16:11:21 -08:00
Daniel Nephin 4251f2b732 Merge pull request #911 from ggtools/release_notes 
Add missing cpu_shares option for rel. 1.1.0-rc1
 2015-02-06 10:47:40 -05:00
Aanand Prasad b25ed59b1c Tweak intro 
We shouldn't yet be recommending production use - for now, let's continue to emphasise the development use case and mention staging/CI.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-05 16:17:38 -05:00
Daniel Nephin eabca3d7b7 Merge pull request #907 from apenney/typo 
Fix a small typo.
 2015-02-02 11:02:12 -05:00
Christophe Labouisse 45b8d526ba Add missing cpu_shares option for rel. 1.1.0-rc1 
Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-02-01 17:03:50 +01:00
Ashley Penney 75247e5a54 Fix a small typo. 2015-01-31 20:00:04 -05:00
Fred Lifton 2cf1fa6c9d Merge pull request #902 from SvenDowideit/iterate-on-freds-index-doc-revisions 
Edit and revision of overview & quick start doc
 2015-01-30 10:57:19 -08:00
Sven Dowideit 3b7ea5c055 resolve most of my comments 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-01-30 21:27:57 +10:00
Fred Lifton 461f1ad5d5 Edit and revision of overview & quick start doc 
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
 2015-01-29 19:55:11 -08:00
Fred Lifton 2307adc4b2 Merge pull request #855 from SvenDowideit/add-docker-docs-metadata-and-reflow-to-80-chars 
Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify GH diffs
 2015-01-29 19:21:23 -08:00
Sven Dowideit d8d0fd6dc9 Add Docker docs.docker.com meta-data, and reflow to 80-chars to simplify github diffs 
Signed-off-by: Sven Dowideit <SvenDowideit@docker.com>
 2015-01-30 13:11:48 +10:00
Aanand Prasad e4d6a2c240 Merge pull request #900 from aanand/ship-1.1.0-rc2 
Ship 1.1.0-rc2
 2015-01-29 18:00:26 -05:00
Aanand Prasad deb2de3c07 Ship 1.1.0-rc2 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 18:00:10 -05:00
Aanand Prasad bc1f6c97d8 Merge pull request #898 from aanand/support-fig-yml 
Support fig.yml
 2015-01-29 13:47:49 -05:00
Aanand Prasad 7c087f1c07 Support fig.y(a)ml and show a deprecation warning 
Closes #864

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-29 13:14:44 -05:00
Ben Firshman fd30920aac Merge pull request #897 from aanand/nicer-env-file-error 
Nicer env file error
 2015-01-29 00:51:05 +00:00
Aanand Prasad 9bc7604e0e Make sure we're testing uppercase directories properly 
(OS X is case-sensitive so we can't have fixture dirs which are
identically named if you ignore case)

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 17:19:27 -05:00
Aanand Prasad de07e0471e Show a nicer error when the env file doesn't exist 
Closes #865

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:20:01 -05:00
Aanand Prasad dfc6206d0d Extract get_env_files() 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Aanand Prasad 6c45b6ccdb Make sure we're testing blank lines and comments in env files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-28 16:18:02 -05:00
Daniel Nephin d79dc85fa5 Merge pull request #887 from albers/multiple-configfiles 
Bash completion supports fig.yml and other legacy filenames
 2015-01-27 23:08:23 -05:00
Aanand Prasad 22aca1a8a5 Merge pull request #879 from albers/bash-completion 
Update bash completion for compose 1.1.0-rc1
 2015-01-27 16:34:33 -05:00
Aanand Prasad 74302560f5 Merge pull request #891 from aanand/fix-image-volumes-test 
Fix test for image-declared volumes
 2015-01-27 16:33:59 -05:00
Aanand Prasad bc2f6044fd Merge pull request #880 from dnephin/use_latest_docker_py 
Use latest docker-py
 2015-01-27 16:32:56 -05:00
Aanand Prasad 1476027410 Fix test for image-declared volumes 
A stray 'fig' got lost in the merge post-rename, meaning the containers
weren't being cleaned up properly.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-01-27 14:46:58 -05:00
Daniel Nephin 28fa49e569 Merge pull request #810 from madwire/patch-1 
Tweaks to the rails tutorial to bring it inline with rails 4.2 release
 2015-01-27 14:45:31 -05:00
Harald Albers 27e4f982fa Bash completion supports fig.yml and other legacy filenames 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-27 09:03:04 +01:00
Daniel Nephin 0bc4a28dcc Use latest docker-py. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-01-25 15:33:15 -05:00
Harald Albers bd535c76d0 Add --service-ports to bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-25 09:47:30 -08:00
Daniel Nephin ef027599f7 Merge pull request #871 from albers/bash-completion 
Rebrand bash completion script
 2015-01-22 12:52:27 -05:00
Harald Albers f1e4fb7736 Rebrand bash completion script 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-01-22 16:07:11 +01:00
Aanand Prasad df3221df61 Merge pull request #862 from aanand/ship-1.1.0rc1 
Ship 1.1.0rc1
 2015-01-20 22:50:39 +00:00
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