23ab2c7e44
Merge pull request #2878 from dnephin/merge_build_args
...
Merge build.args when merging services
2016-02-11 17:41:41 +00:00
b8f7bbb84e
Merge pull request #2830 from nubs/master
...
Add support for shm_size. Fixes #2823 .
2016-02-11 17:34:44 +00:00
a5d95612e0
Merge pull request #2881 from humitos/patch-1
...
Typo fixed
2016-02-11 09:28:08 -08:00
643166ae98
Updating Dockerfile
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-10 20:47:15 -08:00
ac14642d94
Typo fixed
...
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
2016-02-10 19:00:17 -05:00
ab40d389d0
Fix sorting of DOCKER_START_KEYS.
...
Make sure it's sorted!
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
5e6dc3521c
Add support for shm_size. Fixes #2823 .
...
shm_size controls the size of /dev/shm in the container and requires
Docker 1.10 or newer (API version 1.22). This requires docker-py 1.8.0
(docker/docker-py#923 ).
Similar to fields like `mem_limit`, `shm_size` may be specified as
either an integer or a string (e.g., `64M`).
Updating docker-py to the master branch in order to get the unreleased
dependency on `shm_size` there in place.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-10 15:25:18 -06:00
37564a73c3
Merge build.args when merging services.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-10 13:54:40 -05:00
7b5bad6050
Merge pull request #2851 from cr7pt0gr4ph7/2839-fix-networks-merging
...
Fix merge behavior for 'networks' and 'network_mode'.
2016-02-10 17:51:01 +00:00
c43b25b0cf
Merge pull request #2827 from loic/patch-1
...
Fixed typo in compose-file.md
2016-02-10 15:58:54 +00:00
ab9d82b400
Merge pull request #2842 from michael-k/links
...
Fixed broken links on pypi
2016-02-10 15:58:39 +00:00
88b11afde2
Merge pull request #2858 from dnephin/fix_upgrading_url_in_changelog
...
Fix upgrading url in changelog
2016-02-10 15:58:02 +00:00
28689a57a7
Merge pull request #2871 from yograterol/patch-1
...
Typo into the doc with `networks` in yaml
2016-02-10 15:57:45 +00:00
ab6e07da7d
Fix version in install guide
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-10 15:56:50 +00:00
59a2920758
Typo into the doc with `networks` in yaml
...
Signed-off-by: Yohan Graterol <yohangraterol92@gmail.com>
2016-02-09 18:45:04 -05:00
6f06b3bd30
Merge pull request #2853 from dnephin/fix_short_id_alias
...
Use 12 characters for the short id
2016-02-09 14:56:24 -05:00
481caa8e48
Used absolute links in readme
...
This prevents links being broken on pypi
(e.g. https://pypi.python.org/pypi/docs/index.md#features )
Signed-off-by: Michael Käufl <docker-compose@c.michael-kaeufl.de>
2016-02-09 13:29:14 +01:00
63870fbccd
Fix upgrading url.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-08 18:15:21 -05:00
582de19a5a
Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests.
...
Signed-off-by: cr7pt0gr4ph7 <cr7pt0gr4ph7@gmail.com>
2016-02-08 21:57:15 +01:00
859cc2348c
Merge pull request #2744 from aanand/pytest-ini
...
Add pytest.ini
2016-02-08 14:19:40 -05:00
fdf4a2e89e
Merge pull request #2734 from jrabbit/empty-env-var-2359
...
Empty env var #2359
2016-02-08 11:17:54 -08:00
421981e7d2
Use 12 characters for the short id to match docker and fix backwards compatibility.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-08 12:18:48 -05:00
5bd88f634f
Handle the 'network_mode' key when merging multiple compose files.
...
Fixes docker/compose#2840 .
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
2016-02-08 15:33:26 +01:00
5a3a10d43b
Correctly merge the 'services/<service>/networks' key in the case of multiple compose files.
...
Fixes docker/compose#2839 .
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
2016-02-08 15:17:21 +01:00
e929086c49
Separate MergePortsTest from MergeListsTest and add MergeNetworksTest.
...
Signed-off-by: Lukas Waslowski <cr7pt0gr4ph7@gmail.com>
2016-02-08 14:29:03 +01:00
677c50650c
Change special case from '_', None to ()
...
Signed-off-by: jrabbit <jackjrabbit@gmail.com>
2016-02-06 02:54:06 -05:00
8acb5e17e8
Add pytest section to tox.ini
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-05 13:07:01 +00:00
b635647105
Fixed typo in compose-file.md
...
Signed-off-by: Loïc Bistuer <loic.bistuer@gmail.com>
2016-02-05 09:50:22 +07:00
57fc85b457
Wrap long lines and restrict lines to 105 characters.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 19:05:39 -05:00
28e652daec
Merge pull request #2826 from aanand/bump-1.7.0dev
...
Bump 1.7.0dev
2016-02-04 18:56:27 -05:00
869e815213
Bump 1.7.0dev
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 23:46:41 +00:00
9503aa2b5f
Merge pull request #2821 from aanand/bump-1.6.0
...
Bump 1.6.0
2016-02-04 20:20:58 +00:00
d99cad60e7
Bump 1.6.0
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:43:26 +00:00
8199c4a6e1
Improve names in Compose file 2 example
...
Just makes it a bit clearer what's going on.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-04 19:43:26 +00:00
422ff623b4
Merge pull request #2819 from bfirsh/improve-names-in-compose-file-2-example
...
Improve names in Compose file 2 example
2016-02-04 19:42:22 +00:00
19ae76a442
Update docker-py and dockerpty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:41:11 +00:00
c2db1a24bf
Merge pull request #2822 from aanand/update-docker-py-and-dockerpty
...
Update docker-py and dockerpty
2016-02-04 19:40:41 +00:00
be236d8801
Update docker-py and dockerpty
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 19:16:01 +00:00
a55210413c
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 17:21:15 +00:00
93426cec4c
Merge pull request #2824 from dnephin/docs_version_is_a_string
...
Update docs for version being a string
2016-02-04 17:20:32 +00:00
a7c2987991
Update docs for version being a string.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-04 12:19:43 -05:00
6caa188730
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-04 15:57:29 +00:00
386974f831
Merge pull request #2814 from nubs/patch-1
...
Fix example formatting for depends_on.
2016-02-04 15:56:27 +00:00
413a55aa71
Connect container to networks before starting it
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-04 14:43:11 +00:00
80d02e84e2
Merge pull request #2808 from aanand/connect-before-start
...
Connect container to networks before starting it
2016-02-03 23:49:56 -05:00
bdddbe3a73
Improve names in Compose file 2 example
...
Just makes it a bit clearer what's going on.
Signed-off-by: Ben Firshman <ben@firshman.co.uk>
2016-02-03 17:42:57 -08:00
f612bc98d9
Fix example formatting for depends_on.
...
Markdown was acting against expectations here by merging the example indented YAML into the previous list item instead of treating it as a code block.
I decided that a better way of handling this would be to add a "Simple example:" line that is also used elsewhere in this file. It resets the markdown indentation in a way that works.
Signed-off-by: Spencer Rinehart <anubis@overthemonkey.com>
2016-02-03 14:36:46 -06:00
64336615cf
Falling back to default project name when COMPOSE_PROJECT_NAME is set to empty
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2016-02-03 18:21:44 +00:00
a59982eb11
Fixing duplicate identifiers
...
Signed-off-by: Mary Anthony <mary@docker.com>
2016-02-03 18:21:44 +00:00
46f33f12b0
Update merge docs with depends_on, and correction about how links and volumes_from are merged.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-03 18:21:44 +00:00
Aanand Prasad
Joffrey F
Mary Anthony
Manuel Kaufmann
Spencer Rinehart
Daniel Nephin
Yohan Graterol
Daniel Nephin
Michael Käufl
cr7pt0gr4ph7
jrabbit
Loïc Bistuer
Ben Firshman
Dimitar Bonev