tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
1,294 Commits 23 Branches 268 Tags
Commit Graph

1294 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Rotem Yaari
81a32a266f Remove restriction for requests version, update docker-py requirement 2015-03-13 14:39:11 +02:00
Aanand Prasad
25c70c2af4 Merge pull request #1076 from gilclark/master 
Make volumes_from and net containers first class dependencies
 2015-03-13 11:46:13 +00:00
Aanand Prasad
7b1f01bb52 Add script/shell 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-12 14:02:14 +00:00
Daniel Nephin
c23189a5fa Merge pull request #971 from IanVS/master 
Provide user override option on command line
 2015-03-11 10:16:43 -04:00
Ian VanSchooten
86b723e227 Provide user override option on command line 
Allows overriding a user on the command line from the one specified in
the docker-compose.yml

The added tests verify that a specified user overrides a default
user in the docker-compose.yml file.

Based on commit f2f01e207b491866349db7168e3d48082d7abdda by @chmouel

Signed-off-by: Ian VanSchooten <ian@badgelabsllc.com>
 2015-03-11 00:11:31 -04:00
Paul Horn
2534a0964f Add timeout flag to stop, restart, and up 
The commands `stop`, `restart`, and `up` now support a flag `--timeout`.
It represents the number of seconds to give the services to comply to
the command. In case of `up`, this is only relevant if running in
attached mode.

Signed-off-by: Paul Horn <knutwalker@gmail.com>
 2015-03-10 12:21:58 +01:00
Aanand Prasad
42e6296b0e Kick everything off from a single container 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00:00
Aanand Prasad
74440b2f92 Run tests using Docker-in-Docker so we can test multiple versions 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-09 17:53:54 +00:00
Gil Clark
95f4e2c7c3 Make volumes_from and net containers first class dependencies and 
assure that starting order is correct.  Added supporting unit and
integration tests as well.

Signed-off-by: Gil Clark <gilclark1@gmail.com>
 2015-03-06 13:30:56 -08:00
Ben Firshman
9e9a66f0f8 Merge pull request #965 from albers/bash-completion 
Favour yml and yaml extensions in bash completion for -f
 2015-03-06 15:20:12 +00:00
Ben Firshman
300234429c Merge pull request #1034 from bfirsh/remove-d11wtq-as-maintainer 
Remove @d11wtq as a maintainer
 2015-03-05 11:14:50 +00:00
Ben Firshman
3384bc5fcf Merge pull request #1059 from bfirsh/fix-missing-space-in-docs 
Fix missing space in rails docs
 2015-03-05 11:14:37 +00:00
Ben Firshman
08f936b2e7 Fix missing space in rails docs 
From #1031

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-03-04 10:27:25 +00:00
Ben Firshman
df925bc759 Merge pull request #1031 from fredlf/edit-qs-guides 
Edits and revisions to Compose Quickstart guides
 2015-03-04 10:26:32 +00:00
Aanand Prasad
33c7b3f752 Merge pull request #1052 from albers/bash-completion-rm-f 
Add -f flag to bash completion for docker-compose rm
 2015-03-02 18:15:12 +00:00
Harald Albers
ac7a97f420 Add -f flag to bash completion for docker-compose rm 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-03-02 18:33:34 +01:00
Aanand Prasad
d5fcb0de67 Merge pull request #970 from dnephin/fix_environment_as_list_bug 
Fix merging command line environment with config environment
 2015-03-02 15:28:05 +00:00
Daniel Nephin
f47431d591 Resolves #927 - fix merging command line environment with a list in the config 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-03-02 10:23:43 -05:00
Aanand Prasad
8610adcaf3 Merge pull request #997 from abesto/use-latest-docker-py 
Use docker-py 1.0.0
 2015-03-02 14:15:18 +00:00
Zoltan Nagy
8f38b28816 Use docker-py 1.0.0 
Signed-off-by: Zoltan Nagy <abesto@abesto.net>
 2015-03-02 13:11:02 +01:00
Aanand Prasad
db3b4731cd Merge pull request #1044 from usrenmae/py3-compat 
Move several steps closer to python3 compatibility
 2015-03-02 12:08:39 +00:00
Aanand Prasad
30b7c22c71 Merge pull request #1043 from alunduil/add-bashcomp-to-sdist 
add bash completion to sdist
 2015-03-02 12:05:09 +00:00
Aanand Prasad
f89f9e3190 Merge pull request #1007 from KingsleyKelly/force 
Add -f flag as option on rm.
 2015-03-02 11:26:28 +00:00
Igor Ch
f1fc1d7a16 Move several steps closer to python3 compatibility 
Signed-off-by: Igor Ch <usrenmae@gmail.com>
 2015-02-28 23:26:20 +02:00
Alex Brandt
0e30d0085b add bash completion to sdist 
When installing from the source distribution (for packaging or other
purposes), it's convenient to be able to install the bash completion
file as part of that process.
 2015-02-28 15:18:29 -06:00
Ben Firshman
98f32a21e7 Remove @d11wtq as a maintainer 
Thanks for all the help!

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-27 11:18:41 +00:00
KingsleyKelly
fa195bc829 Add -f flag as option on rm. 
Signed-off-by: Kingsley Kelly <kingsley.kelly@gmail.com>
 2015-02-27 07:24:43 +00:00
Fred Lifton
882dc673ce Edits and revisions to Compose Quickstart guides 2015-02-26 18:58:06 -08:00
Ben Firshman
44f5a3ea46 Merge pull request #1028 from aanand/update-readme 
Update README with new docs URL and IRC channel
 2015-02-26 14:11:37 +00:00
Ben Firshman
ac4e800763 Merge pull request #1009 from aanand/update-docker-install-instructions 
Point at official Docker install instructions rather than repeating them
 2015-02-25 19:11:08 +00:00
Ben Firshman
2e57575a61 Merge pull request #1018 from aanand/link-to-getting-started-guides 
Build and link to getting started guides
 2015-02-25 19:07:57 +00:00
Ben Firshman
03535a6158 Merge pull request #1027 from aanand/ship-1.1.0 
Ship 1.1.0
1.1.0 		2015-02-25 18:42:28 +00:00
Aanand Prasad
c41342501b Update README with new docs URL and IRC channel 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:25:15 +00:00
Aanand Prasad
4ac02bfca6 Ship 1.1.0 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 18:16:44 +00:00
Aanand Prasad
35d5d1a5b1 Build and link to getting started guides 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:54:02 +00:00
Aanand Prasad
72003de737 Merge pull request #1020 from bfirsh/move-docs-index-higher-up-on-compose-docs 
Move docs index higher up on index page
 2015-02-25 17:52:56 +00:00
Ben Firshman
a0db5bee3e Merge pull request #1022 from aanand/previously-known-as 
Add 'previously known as Fig' note to README.md
 2015-02-25 17:52:04 +00:00
Ben Firshman
59c45e3398 Merge pull request #1026 from aanand/fix-requests-version-range 
Fix requests version range
 2015-02-25 17:51:39 +00:00
Aanand Prasad
ea8364fd11 Add 'previously known as Fig' note to README.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:39:12 +00:00
Aanand Prasad
cf6b09e94b Fix requests version range 
It was more permissive than docker-py's, resulting in an incompatible
version (2.5.x) being installed.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 17:34:22 +00:00
Ben Firshman
66555aa69b Merge pull request #1021 from aanand/update-urls 
Update URLs in documentation
 2015-02-25 16:48:28 +00:00
Aanand Prasad
bb943d5cb5 Update URLs in documentation 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 14:58:03 +00:00
Ben Firshman
178c50d46f Move docs index higher up on index page 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-25 14:09:30 +00:00
Ben Firshman
32cdabefc2 Merge pull request #1016 from SvenDowideit/docs-tweak 
Add an index to the bottom of the Compose docs as they're scattered arou...
 2015-02-25 13:55:47 +00:00
Sven Dowideit
5b07c581e0 Add an index to the bottom of the Compose docs as they're scattered around docs.docker.com 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-25 23:38:25 +10:00
Ben Firshman
17bbb9d357 Merge pull request #1017 from aanand/swarm-doc 
Document Swarm integration
 2015-02-25 12:53:07 +00:00
Aanand Prasad
ec2966222a Document Swarm integration 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-25 10:45:40 +00:00
Aanand Prasad
8076c7d7fe Merge pull request #1010 from bfirsh/add-create-message-when-scaling-containers 
Log "creating container" when scaling
 2015-02-24 14:09:12 +00:00
Ben Firshman
b2425c1f1e Log "creating container" when scaling 
If an image needs pulling, it just looks like it's hanging.

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-02-24 13:39:38 +00:00
Aanand Prasad
34c6920b37 Point at official Docker install instructions rather than repeating them 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-02-24 11:43:14 +00:00