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

56 Commits

Author SHA1 Message Date
Daniel Nephin 0f2f9db6d8 Merge pull request #1388 from vdemeester/1303-log-driver-support 
Add support for log-driver as a docker-compose.yml option
 2015-05-07 12:00:42 -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
CJ b06294399a See #1335: Added --read-only 
Signed-off-by: CJ <lim@chernjie.com>
 2015-05-02 23:39:39 +08:00
Daniel Nephin 6c95eed781 Merge pull request #1269 from aanand/labels 
Implement 'labels' option
 2015-04-30 20:49:11 -04: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 a89bc304f6 Merge pull request #1075 from KyleJamesWalker/master 
Support alternate Dockerfile name.
 2015-04-27 10:06:43 -04:00
xuxinkun 688f82c1cf Add cpuset config. 
Signed-off-by: xuxinkun <xuxinkun@gmail.com>
 2015-04-26 00:14:52 +08: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
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
Ben Firshman a1cd00e3f0 Merge pull request #1251 from aanand/extends-guide 
Add tutorial and reference for `extends`
 2015-04-08 15:47:39 +01:00
Aanand Prasad 4f95e81c6d Merge pull request #1166 from spk/fix_example_env_file 
Docs: fix env_file example
 2015-04-07 15:52:10 +01:00
Aanand Prasad f3f7f000fe Add tutorial and reference for `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-04-07 13:46:14 +01:00
Steven Dake 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
Laurent Arnoud 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
Moysés Borges 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
Aanand Prasad 965426e39b Revert "Add 'labels:' config option" 
This reverts commit 721327110d.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-23 15:04:04 -07:00
Aanand Prasad 721327110d Add 'labels:' config option 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 18:12:04 -07:00
Aanand Prasad 4c582e4352 Implement `extends` 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-20 15:45:16 -07:00
Aanand Prasad 528bed9ef6 Fix environment resolution 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2015-03-13 14:22:28 +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
Sven Dowideit bd320b19fe add ./script/doc to build fig documentation using the docs.docker.com tooling 
Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
 2015-02-23 13:56:13 +10: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 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
Christophe Labouisse aa0c43df96 Add cpu_shares option in fig.yml 
This options maps exactly the docker run option with the same name.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-11 20:10:48 +01:00
Daniel Nephin b903217a4a Merge pull request #544 from LuminosoInsight/external-links 
Allow links to containers outside of the project
 2015-01-08 10:39:00 -05:00
Christophe Labouisse 91c90a722a Added missing options 
The stdin_open and tty options are supported by fig but were missing from the documentation.

Signed-off-by: Christophe Labouisse <christophe@labouisse.org>
 2015-01-03 23:20:10 +01:00
Jason Bernardino Alonso 4257707244 Accept an external_links list in the service configuration dictionary to create links to containers outside of the project 
Signed-off-by: Jason Bernardino Alonso <jalonso@luminoso.com>
Signed-off-by: Mauricio de Abreu Antunes <mauricio.abreua@gmail.com>
 2014-12-30 15:31:33 -05:00
Mohammad Salehe 3c105c6db2 Fix typo in dns_search documentation 
Signed-off-by: Mohammad Salehe <salehe+dev@gmail.com>
 2014-12-15 16:37:32 +03:30
Mohammad Salehe 5182bd0968 Add dns_search support in yml config 
Signed-off-by: Mohammad Salehe <salehe@gmail.com>
 2014-12-15 16:37:31 +03:30
Ben Langfeld 98b6d7be78 Add support for 'env_file' key 
Signed-off-by: Ben Langfeld <ben@langfeld.me>
 2014-12-08 23:42:09 +00:00
Tyler Fenby 5c58180538 Add capability add/drop introduced in Docker 1.2 
Signed-off-by: Tyler Fenby <tylerfenby@gmail.com>
 2014-12-08 12:32:52 -05:00
Paul B 04da6b035e Add restart option to Fig. Related to #478 
Signed-off-by: Paul Bonaud <paul@bonaud.fr>
 2014-11-08 12:10:11 +01:00
Aanand Prasad b969988ccb Remove references to docker-osx 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-10-06 14:21:49 +01:00
Ben Firshman 2827786886 Merge pull request #364 from docker/non-numeric-link-alias 
Non-numeric link alias
 2014-09-04 20:39:18 +01:00
Daniel Nephin 07fa169fd2 Resolves #260, #301 and #449 
Adds ~ support and ro mode support for volumes, along with some additional validation.

Signed-off-by: Daniel Nephin <dnephin@gmail.com>
 2014-08-31 02:00:52 -04:00
Aanand Prasad 59e31ff544 Update docs to remove numeric suffix 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 13:08:27 -07:00
Aanand Prasad 73bd4aca74 Use hostnames everywhere in docs, add YAML note and deprecate env.md 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-08-08 11:58:41 -07:00
Ben Firshman 7516b67a14 Add link to docker-osx in yml docs 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:18:21 -07:00
Ben Firshman 5eac04d8d4 Fix typo in yml docs 
From c09734822e

Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-24 14:16:49 -07:00
Saul Shanabrook c09734822e Add warning for mapping local volumes 
Mapping local volumes is not currently supported in boot2docker

https://github.com/boot2docker/boot2docker/issues/413
https://github.com/dotcloud/docker/issues/4023

Signed-off-by: Saul Shanabrook <s.shanabrook@gmail.com>
 2014-07-24 16:37:14 -04:00
Aanand Prasad b559880a80 Document missing .yml options 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-22 15:37:05 -07:00
Aanand Prasad 140ced6a3b Fix and document `dns:` option 
Closes #240.

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-17 18:11:50 -07:00
Aanand Prasad 197fd77b99 Improve some of the .yml options docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:55:13 -07:00
Aanand Prasad 36bef254ff Restructure .yml docs 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:47:43 -07:00
Aanand Prasad 8e265905d3 Add host-in-port-mapping feature to docs and changelog 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2014-07-12 09:38:18 -07:00
Ben Firshman 4afcdbdb3c Add docs for volumes_from 
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
 2014-07-11 12:52:22 -07:00
Ryan Brainard d1052ff666 Add documention for key-only environment 
Signed-off-by: Ryan Brainard <brainard@heroku.com>
 2014-07-11 10:18:17 -07:00
j0hnsmith 6b8044e92c add net param support 
Signed-off-by: Peter Flood <info@whywouldwe.com>
 2014-06-19 11:57:55 +01:00