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
947742852e
Prepping for 1.6 release.
...
Adds release notes and edits/revises new Compose in production doc.
2015-04-06 16:47:07 -07:00
94277a3eb0
Add --pid=host support
...
Allow docker-compsoe to use the docker --pid=host API available in 1.17
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-06 12:44:35 -07:00
11a2100d53
Add a --pid=host feature to expose the host PID space to the container
...
Docker 1.5.0+ introduces a --pid=host feature which allows sharing of PID
namespaces between baremetal and containers. This is useful for atomic
upgrades, atomic rollbacks, and monitoring.
For more details of a real-life use case, check out:
http://sdake.io/2015/01/28/an-atomic-upgrade-process-for-openstack-compute-nodes/
Signed-off-by: Steven Dake <stdake@cisco.com>
2015-04-06 11:45:37 -07:00
530d7af5cf
Merge pull request #1253 from aanand/production-guide
...
Add guide to using Compose in production
2015-04-06 10:49:49 -07:00
502d58abe6
Add guide to using Compose in production
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-03 18:56:29 -04:00
eb073c53f4
Merge pull request #1249 from asveepay/update_doc
...
Update install docs for permission denied error
2015-04-03 12:31:38 -07:00
d866415b9a
Update install docs for permission denied error
...
Signed-off-by: Roland Cooper <rcooper@enova.com>
2015-04-03 12:21:15 -05:00
dd40658f87
Merge pull request #1238 from aanand/use-docker-1.6-rc3
...
Use Docker 1.6 RC3
2015-04-03 13:00:49 -04:00
b3382ffd4f
Use Docker 1.6 RC4
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-04-03 10:57:28 -04:00
15a0fac939
Merge pull request #1141 from bfirsh/contributing-section-in-readme
...
Add contributing section to readme
2015-04-03 10:56:06 -04:00
e3cff5d17d
Docs: fix env_file example
...
Thanks-to: @aanand
Signed-off-by: Laurent Arnoud <laurent@spkdev.net>
2015-04-01 11:15:09 +02:00
0f70b8638f
Merge pull request #1213 from moysesb/relative_build
...
Make value of 'build:' relative to the yml file.
2015-03-31 21:20:02 -04:00
8584525e8d
Interpret 'build:' as relative to the yml file
...
* This fix introduces one side-effect: the build parameter is now
validated early, when the service dicionary is first constructed.
That leads to less scary stack traces when the path is not valid.
* The tests for the changes introduced here alter the fixtures
of those (otherwise unrelated) tests that make use of the 'build:'
parameter)
Signed-off-by: Moysés Borges Furtado <moyses.furtado@wplex.com.br>
2015-03-31 18:47:26 -03:00
e3e2247159
Merge pull request #1231 from aanand/docker-1.6rc2
...
Test against Docker 1.6 RC2 only
2015-03-31 16:31:03 -04:00
0650c4485a
Test against Docker 1.6 RC2 only
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-31 16:04:22 -04:00
e708f4f59d
Merge pull request #1226 from aanand/merge-multi-value-options
...
Merge multi-value options when extending
2015-03-31 16:01:22 -04:00
907918b492
Merge multi-value options when extending
...
Closes #1143 .
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-31 15:30:59 -04:00
6dbe321a45
Merge pull request #1225 from aanand/fix-1222
...
When extending, `build` replaces `image` and vice versa
2015-03-31 15:23:34 -04:00
2a415ede08
When extending, `build` replaces `image` and vice versa
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-03-30 17:14:19 -04:00
43369cda9c
Merge pull request #1221 from aanand/update-swarm-doc
...
Update Swarm doc
2015-03-30 18:08:16 +01:00
a2557a3354
Merge pull request #1198 from funkyfuture/reformat-contributing.md
...
Reformat CONTRIBUTING.md
2015-03-30 12:08:56 -04:00
Kyle Walker
CJ
Thomas Desvenain
Sam Wing
Daniel Nephin
Aanand Prasad
Michael Chase-Salerno
Harald Albers
Fred Lifton
Aleksandr Vinokurov
Ben Firshman
Steven Dake
Joseph Page
Roland Cooper
Laurent Arnoud
Moysés Borges