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

2785 Commits

Author SHA1 Message Date
Aanand Prasad 50dc27aed7 Merge pull request #2913 from clkao/container-install-fixes 
A few fixes to the container-based install, which is broken on:
 2016-02-18 09:24:10 -08:00
Aanand Prasad bd72670947 Merge pull request #2894 from dnephin/only_set_constraint_with_volumes 
Only set a container affinity if there are volumes to copy over
 2016-02-18 08:46:29 -08:00
Daniel Nephin 4f7530c480 Only set a container affinity if there are volumes to copy over. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 22:35:14 -05:00
Joffrey F 1952b52392 Constraint build argument types. Numbers are cast into strings 
Numerical driver_opts are also valid and typecast into strings.
Additional config tests.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-17 11:53:29 -08:00
Joffrey F 706062ad16 Merge pull request #2934 from dnephin/fix_volume_copy 
Fix copying of volumes by using the name of the volume
 2016-02-17 11:52:18 -08:00
Daniel Nephin d4f2f54cf8 Merge pull request #2936 from dnephin/update_docs_for_161 
Update docs, fix broken link, use v2 compose file format
 2016-02-17 13:34:39 -05:00
Daniel Nephin 4a09da43ea Fix copying of volumes by using the name of the volume instead of the host path. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-17 13:34:14 -05:00
Joffrey F 89108f2a0f Merge pull request #2939 from AvdN/patch-2 
for 1.6.0 the version value needs to be a string
 2016-02-17 09:42:41 -08:00
Anthon van der Neut 1512793b30 for 1.6.0 the version value needs to be a string 
After conversion a file would immediately not load in docker-compose 1.6.0 with the message:

  ERROR: Version in "./converted.yml" is invalid - it should be a string.

Signed-off-by: Anthon van der Neut anthon@mnt.org
Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-17 10:01:16 +01:00
Daniel Nephin 471264239f Update guides to use v2 config format. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:26 -05:00
Daniel Nephin 4de12ad7a1 Update link to docker volume create docs. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-16 16:43:22 -05:00
Joffrey F ec3af7d491 Merge pull request #2920 from londoncalling/docs-examples 
update to description of files generated from examples, which are no …
 2016-02-16 11:51:14 -08:00
Victoria Bialas 8af0a0f85b update to description of files generated from examples, which are no longer owned by root w/new release 
updated descriptions of changing file ownership and images per Seb's comments

fixed line wraps

fixed line breaks per Joffrey's comments

Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
 2016-02-16 11:34:59 -08:00
moxiegirl b8c35e1298 Merge pull request #2884 from moxiegirl/remove-tutorials 
Updating Dockerfile
 2016-02-16 08:09:49 -08:00
Anthon van der Neut 69d0154718 reset colors after warning 
If a warning is shown, and you happen to have no color setting in your (bash) prompt, the \033[37m setting, stays active. With the message hardly readable (light grey on my default light yellow background), that means the prompt is barely visible and you need to do `tput reset`.
Would probably be better if the background color was set as well in case you have dark on light theme by default in your terminal.

Signed-off-by: Anthon van der Neut <a.van.der.neut@ruamel.eu>
 2016-02-16 15:42:43 +01:00
Chia-liang Kao 2204b642ef Quote argv as they are 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:57:04 +08:00
Chia-liang Kao e6a675f338 Detect -t and -i separately 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:56:26 +08:00
Chia-liang Kao dd55415d4f Don't mount pwd if it is / 
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
 2016-02-14 01:56:17 +08:00
Daniel Nephin 74dc1b1411 Merge pull request #2893 from shin-/2833-run-dependencies 
Bring up all dependencies when running a single service.
 2016-02-12 16:33:01 -05:00
Daniel Nephin 16200b0bce Merge pull request #2903 from shin-/2899-invalid-driver-opts 
driver_opts can only be of type string
 2016-02-12 14:41:05 -05:00
Joffrey F a8fda480e3 driver_opts can only be of type string 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-12 10:51:11 -08:00
Joffrey F 367fabdbfa Bring up all dependencies when running a single service. 
Added test for running a depends_on service

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-12 09:46:10 -08:00
Joffrey F e1d67ad68a Merge pull request #2882 from shin-/2715-old-server-error 
Detailed error message when daemon version is too old.
 2016-02-11 16:03:20 -08:00
Daniel Nephin b6812b8600 Merge pull request #2877 from dnephin/fix_merging_build 
Fix build section without context
 2016-02-11 18:53:23 -05:00
Joffrey F 79f993f52c Detailed error message when daemon version is too old. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-11 15:20:32 -08:00
Joffrey F 77cf67ba8a Merge pull request #2888 from dnephin/upgrade_pyinstaller 
Upgrade pyinstaller.
 2016-02-11 12:11:57 -08:00
Joffrey F 5eb45a31e6 Merge pull request #2883 from shin-/2849-log-volume-creation 
Add logging when initializing a volume.
 2016-02-11 12:11:28 -08:00
Joffrey F e225f12551 Add logging when initializing a volume. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-02-11 11:40:22 -08:00
Joffrey F 830a9fc118 Merge pull request #2889 from dnephin/fix_test_broken_on_master 
Shm_size requires docker 1.10
 2016-02-11 11:18:45 -08:00
Daniel Nephin 532dffd688 Fix build section without context. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 14:12:02 -05:00
Daniel Nephin 1e7dd2e740 Upgrade pyinstaller. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 13:50:41 -05:00
Daniel Nephin 740329a131 Shm_size requires docker 1.10. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-11 13:50:23 -05:00
Daniel Nephin 7bae4cdbb2 Merge pull request #2875 from aanand/fix-version-in-install-guide 
Fix version in install guide
 2016-02-11 12:43:51 -05:00
Aanand Prasad 23ab2c7e44 Merge pull request #2878 from dnephin/merge_build_args 
Merge build.args when merging services
 2016-02-11 17:41:41 +00:00
Aanand Prasad b8f7bbb84e Merge pull request #2830 from nubs/master 
Add support for shm_size.  Fixes #2823.
 2016-02-11 17:34:44 +00:00
Joffrey F a5d95612e0 Merge pull request #2881 from humitos/patch-1 
Typo fixed
 2016-02-11 09:28:08 -08:00
Mary Anthony 643166ae98 Updating Dockerfile 
Signed-off-by: Mary Anthony <mary@docker.com>
 2016-02-10 20:47:15 -08:00
Manuel Kaufmann ac14642d94 Typo fixed 
Signed-off-by: Manuel Kaufmann <humitos@gmail.com>
 2016-02-10 19:00:17 -05:00
Spencer Rinehart 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
Spencer Rinehart 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
Daniel Nephin 37564a73c3 Merge build.args when merging services. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-02-10 13:54:40 -05:00
Aanand Prasad 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
Aanand Prasad c43b25b0cf Merge pull request #2827 from loic/patch-1 
Fixed typo in compose-file.md
 2016-02-10 15:58:54 +00:00
Aanand Prasad ab9d82b400 Merge pull request #2842 from michael-k/links 
Fixed broken links on pypi
 2016-02-10 15:58:39 +00:00
Aanand Prasad 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
Aanand Prasad 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
Aanand Prasad ab6e07da7d Fix version in install guide 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-02-10 15:56:50 +00:00
Yohan Graterol 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
Daniel Nephin 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
Michael Käufl 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