1d67e6f0f0
Merge pull request #2995 from dnephin/fix_warning_about_bools
...
Fix warning about boolean values
2016-02-23 11:11:54 -08:00
ba799d2e86
Merge pull request #2996 from dnephin/fix_abort_on_container_exit
...
Fix abort on container exit
2016-02-23 10:52:12 -08:00
a7fd578b14
Merge pull request #2962 from shin-/2960-volume-driver
...
Update docs for volume_driver option
2016-02-22 17:23:07 -08:00
176b966486
Update documentation for volume_driver option.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-22 16:51:33 -08:00
7e3d756a18
Merge pull request #2992 from shin-/update_dockerpy_version
...
Use docker-py 1.7.1
2016-02-22 16:50:36 -08:00
15b2094bad
Stop other containers if the flag is set.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-22 16:48:46 -08:00
bf2bf21720
Add failing test for --abort-on-container-exit
...
Handle --abort-on-container-exit. Fixes #2940
Signed-off-by: Richard Bann <richardbann@gmail.com>
2016-02-22 16:39:40 -08:00
0a06d827fa
Fix warning about boolean values.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-22 14:56:01 -08:00
ba39d4cc77
Use docker-py 1.7.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-22 12:56:54 -08:00
d5514965d5
Merge pull request #2975 from dnephin/fix_crash_on_none_in_config
...
Fix validation message when there are multiple nested oneOf validations.
2016-02-19 15:53:26 -05:00
02535f0cf1
Fix validation message when there are multiple ested oneOf validations.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 14:22:55 -05:00
c7ceacfeae
Merge pull request #2948 from dnephin/validate_top_level
...
Validate that each section of the config is a mapping
2016-02-19 13:41:50 -05:00
bed0cfeb32
Merge pull request #2807 from aanand/swarm-doc
...
Update Swarm integration guide and make it an official part of the docs
2016-02-19 10:25:28 -08:00
0d218c34c7
Make config validation error messages more consistent.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 13:12:57 -05:00
4b2a666231
Validate that each section of the config is a mapping before running interpolation.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-19 12:38:52 -05:00
520c695bf4
Update Swarm integration guide and make it an official part of the docs
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-02-19 09:32:43 -08:00
1f2c2942d7
Merge pull request #2963 from londoncalling/docs-alias-repr2829
...
corrected description of network aliases, added real-world example pe…
2016-02-19 09:26:40 -08:00
753c953870
Merge branch 'docs-alias-repr2829' of github.com:londoncalling/compose into docs-alias-repr2829
...
Fixed file format of one word, legacy, adding signature to that commit.
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 18:32:44 -08:00
eb4a98c0d1
corrected description of network aliases, added real-world example per #2907
...
copyedit to make show as file format
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 18:05:52 -08:00
630a50295b
copyedit to make show as file format
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 18:05:30 -08:00
068a56eb97
corrected description of network aliases, added real-world example per #2907
...
Signed-off-by: Victoria Bialas <victoria.bialas@docker.com>
2016-02-18 17:49:28 -08:00
5fc0df4be2
Merge pull request #2907 from shin-/2829-net-alias
...
Allow user to specify custom network aliases
2016-02-18 16:01:30 -08:00
0cb8ba3775
Use modern set notation in _get_aliases
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:28:12 -08:00
7152f7ea76
Handle mismatched network formats in config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:24:41 -08:00
825a0941f0
Network aliases are now part of the network dictionary
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
4b99b32ffb
Add v2_only decorator to network aliases test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
41e399be98
Fix network list serialization in py3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
7801cfc5d1
Document network_aliases config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:47 -08:00
633e349ab9
Test network_aliases feature
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:46 -08:00
2b5d3f51cb
Allow user to specify custom network aliases
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 15:23:46 -08:00
d3a95c2892
Merge pull request #2938 from shin-/2927-buildargs-types
...
Constraint build argument types. Numbers are cast into strings.
2016-02-18 15:07:09 -08:00
93a02e497d
Apply driver_opts processing to network configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-02-18 10:53:40 -08:00
85ba08bb13
Merge pull request #2932 from AvdN/patch-1
...
reset colors after warning
2016-02-18 09:25:02 -08:00
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
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
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
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
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
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
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
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
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
471264239f
Update guides to use v2 config format.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:26 -05:00
4de12ad7a1
Update link to docker volume create docs.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-02-16 16:43:22 -05:00
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
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
b8c35e1298
Merge pull request #2884 from moxiegirl/remove-tutorials
...
Updating Dockerfile
2016-02-16 08:09:49 -08:00
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
2204b642ef
Quote argv as they are
...
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
2016-02-14 01:57:04 +08:00
e6a675f338
Detect -t and -i separately
...
Signed-off-by: Chia-liang Kao <clkao@clkao.org>
2016-02-14 01:56:26 +08:00
Daniel Nephin
Joffrey F
Joffrey F
Daniel Nephin
Richard Bann
Aanand Prasad
Victoria Bialas
Anthon van der Neut
moxiegirl
Chia-liang Kao