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
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
9532e5a4f2
Merge pull request #1331 from xuxinkun/cpuset20150424
...
Add cpuset config.
2015-04-28 13:21:00 -04:00
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
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
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
b808674132
Merge pull request #1360 from aanand/remove-wercker
...
Remove wercker.yml
2015-04-27 10:17:41 -04:00
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
7d617d60bc
Remove wercker.yml
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-27 15:10:01 +01:00
da71e01d30
Merge pull request #1359 from aanand/remove-dco-validation
...
Remove DCO validation from CI script
2015-04-27 15:08:51 +01:00
a89bc304f6
Merge pull request #1075 from KyleJamesWalker/master
...
Support alternate Dockerfile name.
2015-04-27 10:06:43 -04:00
240495f07f
Remove DCO validation from CI script
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-27 15:02:24 +01:00
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
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
3af56e1602
Merge pull request #1200 from chanezon/1148-pat-paul
...
paulczar fixes plus example file
2015-04-27 14:54:14 +01:00
16f8106149
Merge pull request #1158 from chernjie/addhosts
...
Add extra_hosts to yml configuration --add-hosts
2015-04-27 12:26:29 +01:00
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
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
688f82c1cf
Add cpuset config.
...
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
2015-04-26 00:14:52 +08:00
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
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
d17c4d27fa
Support alternate Dockerfile name.
...
Signed-off-by: Kyle James Walker <KyleJamesWalker@gmail.com>
2015-04-24 08:30:36 -07:00
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
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
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
e6ec76161d
Merge pull request #1293 from mchasal/1224
...
1224: Check that image or build is specified.
2015-04-21 15:19:11 -04:00
b317071cf3
Merge pull request #1205 from josephpage/run-rm-restart
...
[cli] run --rm overrides restart: always
2015-04-21 15:48:43 +01:00
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
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
2cdde099fa
Merge pull request #1297 from aanand/bump-1.3.0-dev
...
Bump 1.3.0dev
2015-04-16 18:02:59 +01:00
310c7623f9
Bump 1.3.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 17:54:18 +01:00
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
8b5015c10f
Bump 1.2.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-16 17:48:28 +01:00
24a6c240fc
Testcase for #1224 , check that image or build is specified
...
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
2015-04-15 21:38:24 +00:00
15b763acdb
Fix for #1224 , check that image or build is specified
...
Signed-off-by: Michael Chase-Salerno <bratac@linux.vnet.ibm.com>
2015-04-15 02:03:02 +00:00
3cd116b99d
Merge pull request #1278 from albers/completion-run-user
...
Add bash completion for docker-compose run --user
2015-04-14 11:04:03 -04:00
b559653c8c
Merge pull request #1277 from fredlf/add-help-text
...
Adds Where to Get Help section
2015-04-14 15:16:11 +01:00
5f17423d3e
Add bash completion for docker-compose run --user
...
Signed-off-by: Harald Albers <github@albersweb.de>
2015-04-10 19:52:13 +02:00
2a442ec6d9
Adds Where to Get Help section
...
Signed-off-by: Fred Lifton <fred.lifton@docker.com>
2015-04-09 16:23:25 -07:00
ceff5cb9ca
Add parent directories search for default compose-files
...
Does not change directory to the parent with the compose-file found.
Works like passing '--file' or setting 'COMPOSE_FILE' with absolute path.
Resolves issue #946 .
Signed-off-by: Aleksandr Vinokurov <aleksandr.vin@gmail.com>
2015-04-09 22:36:47 +00:00
4926f8aef6
Merge pull request #1261 from aanand/fix-vars-in-volume-paths
...
Fix vars in volume paths
2015-04-09 14:44:07 +01:00
927115c3d4
Merge pull request #1271 from sdake/master
...
Remove stray print
2015-04-09 09:41:27 -04:00
1d7247b67e
Remove stray print
...
A previous commit introduced a stray print operation. Remove it.
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-08 12:49:37 -07:00
a1cd00e3f0
Merge pull request #1251 from aanand/extends-guide
...
Add tutorial and reference for `extends`
2015-04-08 15:47:39 +01:00
fd568b389d
Fix home directory and env expansion in volume paths
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-07 16:23:45 +01:00
4f95e81c6d
Merge pull request #1166 from spk/fix_example_env_file
...
Docs: fix env_file example
2015-04-07 15:52:10 +01:00
619e783a05
Merge pull request #1011 from sdake/master
...
Add a --pid=host feature to expose the host PID space to the container
2015-04-07 13:49:53 +01:00
f3f7f000fe
Add tutorial and reference for `extends`
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-07 13:46:14 +01:00
219751abc7
Merge pull request #1258 from fredlf/1.6-docs-updates
...
Prepping for 1.6 release.
2015-04-07 11:22:02 +01:00
0b48e137e8
add unit tests for run --rm with restart
...
Signed-off-by: Joseph Page <joseph.page@rednet.io>
2015-04-07 10:18:25 +02:00
Aanand Prasad
Daniel Nephin
Ben Firshman
Timothy Van Heest
CJ
xwisen
xuxinkun
Michael Chase-Salerno
Kyle Walker
Thomas Desvenain
Sam Wing
Harald Albers
Fred Lifton
Aleksandr Vinokurov
Steven Dake
Joseph Page