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

1185 Commits

Author SHA1 Message Date
Harald Albers d6223371d6 Fix markdown formatting issue 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-07 04:41:12 -07:00
Daniel Nephin 4817d5944c Merge pull request #1391 from albers/completion-extglob 
Fix #1386 by ensuring that exglob is set in bash completion
 2015-05-06 10:46:13 -04:00
Vincent Demeester f626fc5ce8 Add support for log-driver in docker-compose.yml 
Closes #1303

Signed-off-by: Vincent Demeester <vincent@sbr.pm>
 2015-05-06 13:18:58 +02:00
Harald Albers 1579a125a3 Ensure that exglob is set in bash completion 
Signed-off-by: Harald Albers <github@albersweb.de>
 2015-05-06 09:33:22 +02:00
Daniel Nephin 7fb9ec29c4 Merge pull request #1335 from chernjie/pid_readonly 
docker-compose create --readonly
 2015-05-05 20:50:01 -04:00
Daniel Nephin f78e89f265 Merge pull request #1381 from sherter/help-fix 
Show proper command in help text of build subcommand
 2015-05-05 20:48:25 -04:00
CJ b06294399a See #1335: Added --read-only 
Signed-off-by: CJ <lim@chernjie.com>
 2015-05-02 23:39:39 +08:00
Simon Herter b8e0aed21c Show proper command in help text of build subcommand 
The help text of the build subcommand suggested to use 'compose build' (instead of 'docker-compose build') to rebuild images.

Signed-off-by: Simon Herter <sim.herter@gmail.com>
 2015-05-01 18:58:55 -04:00
Daniel Nephin 4bce388b51 Merge pull request #1376 from aanand/fix-build-non-ascii-filename 
Make sure the build path we pass to docker-py is a binary string
 2015-04-30 20:54:21 -04:00
Daniel Nephin 6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04:00
Aanand Prasad 4f366d8355 Make sure the build path we pass to docker-py is a binary string 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-30 11:57:46 +01:00
Daniel Nephin 878d90febf Merge pull request #1374 from aanand/close-before-attaching 
Close connection after building or pulling
 2015-04-29 18:56:03 -04:00
Aanand Prasad 1a77feea3f Close connection before attaching on 'up' and 'run' 
This ensures that the connection is not recycled, which can cause the
Docker daemon to complain if we've already performed another streaming
call such as doing a build.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 18:42:03 +01:00
Aanand Prasad 7e0ab0714f Merge pull request #1344 from dnephin/fix_pull_with_sha 
Support image with ids instead of names
 2015-04-29 16:46:34 +01:00
Aanand Prasad 2e6bc078fb Implement 'labels' option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 16:45:18 +01:00
Daniel Nephin 3dd860f0ba Fix #923, support image with ids instead of names. 
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2015-04-29 10:13:18 -04:00
Daniel Nephin de800dea0f Merge pull request #1370 from aanand/update-docker-version 
Update Docker version to 1.6 stable
 2015-04-29 10:03:13 -04:00
Aanand Prasad fed4377ef6 Merge pull request #1351 from mchasal/1301-alphabetize_usage 
Fix for #1301, Alphabetize Commands
 2015-04-29 14:21:46 +01:00
Aanand Prasad 021bf46557 Update Docker version to 1.6 stable 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-29 13:58:32 +01:00
Aanand Prasad b7e5116267 Merge pull request #1352 from bfirsh/add-irccloud-invite-link 
Use cool new IRCCloud links for IRC channel
 2015-04-29 13:25:25 +01:00
Daniel Nephin 9532e5a4f2 Merge pull request #1331 from xuxinkun/cpuset20150424 
Add cpuset config.
 2015-04-28 13:21:00 -04:00
Ben Firshman e5a118e3ce Use cool new IRCCloud links for IRC channel 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2015-04-28 14:24:48 +01:00
Daniel Nephin a631c1eddb Merge pull request #1357 from turtlemonvh/1350-extends_parent_build_directory_dne_error 
Fix for #1350, nonexisting build path in parent section causes extending section to fail
 2015-04-27 13:49:01 -04:00
Timothy Van Heest 855855a0e6 Fix for #1350, nonexisting build path in parent section causes extending section to fail 
Signed-off-by: Timothy Van Heest <timothy.vanheest@gmail.com>
 2015-04-27 10:55:30 -04:00
Daniel Nephin b808674132 Merge pull request #1360 from aanand/remove-wercker 
Remove wercker.yml
 2015-04-27 10:17:41 -04:00
Ben Firshman 7e574fca71 Merge pull request #1358 from aanand/update-readme 
Update README.md with changes to docs/index.md
 2015-04-27 15:14:06 +01:00
Aanand Prasad 7d617d60bc Remove wercker.yml 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-27 15:10:01 +01:00
Aanand Prasad da71e01d30 Merge pull request #1359 from aanand/remove-dco-validation 
Remove DCO validation from CI script
 2015-04-27 15:08:51 +01:00
Daniel Nephin a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master 
Support alternate Dockerfile name.
 2015-04-27 10:06:43 -04:00
Aanand Prasad 240495f07f Remove DCO validation from CI script 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-27 15:02:24 +01:00
Aanand Prasad 2e19887bf1 Update README.md with changes to docs/index.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-27 14:59:42 +01:00
Daniel Nephin a982e516fc Merge pull request #1354 from xwisen/master 
modified the release notes section the first[PR #972]to[PR #1088]
 2015-04-27 09:56:46 -04:00
Ben Firshman 3af56e1602 Merge pull request #1200 from chanezon/1148-pat-paul 
paulczar fixes plus example file
 2015-04-27 14:54:14 +01:00
Aanand Prasad 16f8106149 Merge pull request #1158 from chernjie/addhosts 
Add extra_hosts to yml configuration --add-hosts
 2015-04-27 12:26:29 +01:00
CJ 86a08c00f2 See https://github.com/docker/compose/pull/1158#discussion_r29063218 
Signed-off-by: CJ <lim@chernjie.com>
 2015-04-27 14:07:21 +08:00
xwisen 0ca9fa8b2b modified the release notes section the first[PR #972]to[PR #1088] 
Signed-off-by: xwisen <xwisen@gmail.com>
 2015-04-26 13:16:23 +08:00
xuxinkun 688f82c1cf Add cpuset config. 
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
 2015-04-26 00:14:52 +08:00
Michael Chase-Salerno 9a44708081 Fix for #1301, Alphabetize Commands 
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
 2015-04-24 20:45:18 +00:00
Daniel Nephin 89789c54ad Merge pull request #1232 from aleksandr-vin/add-parent-directories-search-for-default-compose-files 
Add parent directories search for default compose-files
 2015-04-24 13:12:24 -04:00
Kyle Walker d17c4d27fa Support alternate Dockerfile name. 
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
 2015-04-24 08:30:36 -07:00
CJ 25ee3f0033 Remove extra s from --add-host 
linting...
six.string_types
list-of-strings in examples
disallow extra_hosts support for list-of-dicts
A more thorough sets of tests for extra_hosts
Provide better examples
As per @aanand's [comment](https://github.com/docker/compose/pull/1158/files#r28326312)

  I think it'd be better to check `if not isinstance(extra_hosts_line,
  six.string_types)` and raise an error saying `extra_hosts_config must be
  either a list of strings or a string->string mapping`. We shouldn't need
  to do anything special with the list-of-dicts case.
order result to work with assert
use set() instead of sort()

Signed-off-by: CJ <lim@chernjie.com>
 2015-04-24 09:21:29 +08:00
Thomas Desvenain 8098b65576 Fix when pyyaml has interpreted line as a dictionary 
Added unit tests in build_extra_hosts + fix

Signed-off-by: CJ <lim@chernjie.com>
 2015-04-24 09:21:21 +08:00
Sam Wing fb81c37ca6 added the extra_hosts option to the yml configuration which exposes the --add-host flag from the docker client 
Signed-off-by: Sam Wing <sampwing@gmail.com>
 2015-04-23 21:54:59 +08:00
Daniel Nephin e6ec76161d Merge pull request #1293 from mchasal/1224 
1224: Check that image or build is specified.
 2015-04-21 15:19:11 -04:00
Aanand Prasad b317071cf3 Merge pull request #1205 from josephpage/run-rm-restart 
[cli] run --rm overrides restart: always
 2015-04-21 15:48:43 +01:00
Aanand Prasad bb922d63f5 Merge pull request #1318 from aanand/fix-restart-timeout 
Fix --timeout flag on restart, add tests for stop and restart
 2015-04-21 15:07:07 +01:00
Aanand Prasad 2291fa2d45 Fix --timeout flag on restart, add tests for stop and restart 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-21 11:59:33 +01:00
Aanand Prasad 2cdde099fa Merge pull request #1297 from aanand/bump-1.3.0-dev 
Bump 1.3.0dev
 2015-04-16 18:02:59 +01:00
Aanand Prasad 310c7623f9 Bump 1.3.0dev 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-16 17:54:18 +01:00
Aanand Prasad 6e64802545 Merge pull request #1296 from aanand/merge-release-1.2.0 
Merge release 1.2.0
 2015-04-16 17:52:47 +01:00