compose

jyapayne/compose

Fork 0

Commit graph

42cb719b52 Add v2_only decorator to network aliases test Joffrey F 2016-02-12 17:48:42 -08:00
6ac6860dda Fix network list serialization in py3 Joffrey F 2016-02-12 17:20:18 -08:00
353da73eab Document network_aliases config Joffrey F 2016-02-12 17:17:31 -08:00
c686be8fd3 Test network_aliases feature Joffrey F 2016-02-12 16:58:29 -08:00
2f7a77e954 Allow user to specify custom network aliases Joffrey F 2016-02-12 16:10:36 -08:00
d78ea85301 driver_opts can only be of type string Joffrey F 2016-02-12 10:41:27 -08:00
7c95c733a9 Only set a container affinity if there are volumes to copy over. Daniel Nephin 2016-02-11 19:53:28 -05:00
dd9a8d6eee Bring up all dependencies when running a single service. Joffrey F 2016-02-11 16:31:08 -08:00
4f7c950ca8 Upgrade pyinstaller. Daniel Nephin 2016-02-11 13:10:29 -05:00
a1d6e3b9e3 Add logging when initializing a volume. Joffrey F 2016-02-10 16:49:50 -08:00
3eac70a9d3 Detailed error message when daemon version is too old. Joffrey F 2016-02-10 16:35:27 -08:00
c7687592ff Typo fixed Manuel Kaufmann 2016-02-10 18:58:01 -05:00
155efd28fa Merge build.args when merging services. Daniel Nephin 2016-02-10 13:54:40 -05:00
2ced83e3d9 Fix build section without context. Daniel Nephin 2016-02-10 13:32:04 -05:00
cea7911f56 Typo into the doc with networks in yaml Yohan Graterol 2016-02-09 18:40:44 -05:00
db12794b1c Fix upgrading url. Daniel Nephin 2016-02-08 18:15:21 -05:00
deeca57a0d Use 12 characters for the short id to match docker and fix backwards compatibility. Daniel Nephin 2016-02-08 12:18:48 -05:00
edcbe2eb4d Simplify unit tests in config/config_test.py by using class variables instead of methods for parametrizing tests. cr7pt0gr4ph7 2016-02-08 21:57:15 +01:00
ad00f3dd21 Handle the 'network_mode' key when merging multiple compose files. Lukas Waslowski 2016-02-08 15:33:26 +01:00
c77a8cfe3b Correctly merge the 'services/<service>/networks' key in the case of multiple compose files. Lukas Waslowski 2016-02-08 15:17:21 +01:00
8548b75582 Separate MergePortsTest from MergeListsTest and add MergeNetworksTest. Lukas Waslowski 2016-02-08 14:29:03 +01:00
c1be49ad53 Used absolute links in readme Michael Käufl 2016-02-06 22:10:22 +01:00
a716bdc482 Update Swarm integration guide and make it an official part of the docs Aanand Prasad 2016-02-02 17:55:21 +00:00
abec6f5891 Change special case from '_', None to () jrabbit 2016-02-06 02:54:06 -05:00
c195915263 Modify service_test.py::ServiceTest::test_resolve_env to reflect new behavior jrabbit 2016-01-24 15:25:06 -05:00
34d8f9b55a Mangle the tests. They pass for better or worse! jrabbit 2016-01-23 16:19:17 -05:00
f5533c1ed8 If an env var is passthrough but not defined on the host don't set it. This doesn't change too much code and keeps the generators. jrabbit 2016-01-23 15:58:06 -05:00
722e3a2fc7 Merge remote-tracking branch 'docker/release' into bump-1.6.1 Daniel Nephin 2016-02-23 11:15:34 -08:00
d451578152 Make environment variables without a value the same as docker-cli. Daniel Nephin 2016-02-22 17:47:51 -08:00
4b04280db8 Revert "Change special case from '_', None to ()" Daniel Nephin 2016-02-22 17:30:42 -08:00
1d67e6f0f0 Merge pull request #2995 from dnephin/fix_warning_about_bools Daniel Nephin 2016-02-23 11:11:54 -08:00
ba799d2e86 Merge pull request #2996 from dnephin/fix_abort_on_container_exit Daniel Nephin 2016-02-23 10:52:12 -08:00
a7fd578b14 Merge pull request #2962 from shin-/2960-volume-driver Joffrey F 2016-02-22 17:23:07 -08:00
176b966486 Update documentation for volume_driver option. Joffrey F 2016-02-18 17:17:20 -08:00
7e3d756a18 Merge pull request #2992 from shin-/update_dockerpy_version Daniel Nephin 2016-02-22 16:50:36 -08:00
15b2094bad Stop other containers if the flag is set. Daniel Nephin 2016-02-22 16:46:09 -08:00
bf2bf21720 Add failing test for --abort-on-container-exit Richard Bann 2016-02-18 12:13:16 +01:00
0a06d827fa Fix warning about boolean values. Daniel Nephin 2016-02-22 14:48:56 -08:00
ba39d4cc77 Use docker-py 1.7.1 Joffrey F 2016-02-22 12:56:54 -08:00
d5514965d5 Merge pull request #2975 from dnephin/fix_crash_on_none_in_config Daniel Nephin 2016-02-19 15:53:26 -05:00
02535f0cf1 Fix validation message when there are multiple ested oneOf validations. Daniel Nephin 2016-02-19 14:22:55 -05:00
c7ceacfeae Merge pull request #2948 from dnephin/validate_top_level Daniel Nephin 2016-02-19 13:41:50 -05:00
bed0cfeb32 Merge pull request #2807 from aanand/swarm-doc Aanand Prasad 2016-02-19 10:25:28 -08:00
0d218c34c7 Make config validation error messages more consistent. Daniel Nephin 2016-02-19 12:35:05 -05:00
4b2a666231 Validate that each section of the config is a mapping before running interpolation. Daniel Nephin 2016-02-16 17:30:23 -05:00
520c695bf4 Update Swarm integration guide and make it an official part of the docs Aanand Prasad 2016-02-02 17:55:21 +00:00
1f2c2942d7 Merge pull request #2963 from londoncalling/docs-alias-repr2829 Aanand Prasad 2016-02-19 09:26:40 -08:00
753c953870 Merge branch 'docs-alias-repr2829' of github.com:londoncalling/compose into docs-alias-repr2829 Victoria Bialas 2016-02-18 18:07:38 -08:00
eb4a98c0d1 corrected description of network aliases, added real-world example per #2907 Victoria Bialas 2016-02-18 17:49:28 -08:00
630a50295b copyedit to make show as file format Victoria Bialas 2016-02-18 18:05:30 -08:00
068a56eb97 corrected description of network aliases, added real-world example per #2907 Victoria Bialas 2016-02-18 17:49:28 -08:00
5fc0df4be2 Merge pull request #2907 from shin-/2829-net-alias Joffrey F 2016-02-18 16:01:30 -08:00
0cb8ba3775 Use modern set notation in _get_aliases Joffrey F 2016-02-18 15:28:12 -08:00
7152f7ea76 Handle mismatched network formats in config files Joffrey F 2016-02-18 14:52:52 -08:00
825a0941f0 Network aliases are now part of the network dictionary Joffrey F 2016-02-18 12:04:07 -08:00
4b99b32ffb Add v2_only decorator to network aliases test Joffrey F 2016-02-12 17:48:42 -08:00
41e399be98 Fix network list serialization in py3 Joffrey F 2016-02-12 17:20:18 -08:00
7801cfc5d1 Document network_aliases config Joffrey F 2016-02-12 17:17:31 -08:00
633e349ab9 Test network_aliases feature Joffrey F 2016-02-12 16:58:29 -08:00
2b5d3f51cb Allow user to specify custom network aliases Joffrey F 2016-02-12 16:10:36 -08:00
d3a95c2892 Merge pull request #2938 from shin-/2927-buildargs-types Joffrey F 2016-02-18 15:07:09 -08:00
93a02e497d Apply driver_opts processing to network configs Joffrey F 2016-02-18 10:53:40 -08:00
85ba08bb13 Merge pull request #2932 from AvdN/patch-1 Aanand Prasad 2016-02-18 09:25:02 -08:00
50dc27aed7 Merge pull request #2913 from clkao/container-install-fixes Aanand Prasad 2016-02-18 09:24:10 -08:00
bd72670947 Merge pull request #2894 from dnephin/only_set_constraint_with_volumes Aanand Prasad 2016-02-18 08:46:29 -08:00
4f7530c480 Only set a container affinity if there are volumes to copy over. Daniel Nephin 2016-02-11 19:53:28 -05:00
1952b52392 Constraint build argument types. Numbers are cast into strings Joffrey F 2016-02-16 16:48:04 -08:00
706062ad16 Merge pull request #2934 from dnephin/fix_volume_copy Joffrey F 2016-02-17 11:52:18 -08:00
d4f2f54cf8 Merge pull request #2936 from dnephin/update_docs_for_161 Daniel Nephin 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. Daniel Nephin 2016-02-16 14:24:17 -05:00
89108f2a0f Merge pull request #2939 from AvdN/patch-2 Joffrey F 2016-02-17 09:42:41 -08:00
1512793b30 for 1.6.0 the version value needs to be a string Anthon van der Neut 2016-02-17 09:56:49 +01:00
471264239f Update guides to use v2 config format. Daniel Nephin 2016-02-16 16:38:31 -05:00
4de12ad7a1 Update link to docker volume create docs. Daniel Nephin 2016-02-16 16:34:31 -05:00
ec3af7d491 Merge pull request #2920 from londoncalling/docs-examples Joffrey F 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 Victoria Bialas 2016-02-14 19:52:27 -08:00
b8c35e1298 Merge pull request #2884 from moxiegirl/remove-tutorials moxiegirl 2016-02-16 08:09:49 -08:00
69d0154718 reset colors after warning Anthon van der Neut 2016-02-16 14:46:47 +01:00
2204b642ef Quote argv as they are Chia-liang Kao 2016-02-14 01:57:04 +08:00
e6a675f338 Detect -t and -i separately Chia-liang Kao 2016-02-14 01:43:06 +08:00
dd55415d4f Don't mount pwd if it is / Chia-liang Kao 2016-02-14 01:42:51 +08:00
74dc1b1411 Merge pull request #2893 from shin-/2833-run-dependencies Daniel Nephin 2016-02-12 16:33:01 -05:00
16200b0bce Merge pull request #2903 from shin-/2899-invalid-driver-opts Daniel Nephin 2016-02-12 14:41:05 -05:00
a8fda480e3 driver_opts can only be of type string Joffrey F 2016-02-12 10:41:27 -08:00
367fabdbfa Bring up all dependencies when running a single service. Joffrey F 2016-02-11 16:31:08 -08:00
e1d67ad68a Merge pull request #2882 from shin-/2715-old-server-error Joffrey F 2016-02-11 16:03:20 -08:00
b6812b8600 Merge pull request #2877 from dnephin/fix_merging_build Daniel Nephin 2016-02-11 18:53:23 -05:00
79f993f52c Detailed error message when daemon version is too old. Joffrey F 2016-02-10 16:35:27 -08:00
77cf67ba8a Merge pull request #2888 from dnephin/upgrade_pyinstaller Joffrey F 2016-02-11 12:11:57 -08:00
5eb45a31e6 Merge pull request #2883 from shin-/2849-log-volume-creation Joffrey F 2016-02-11 12:11:28 -08:00
e225f12551 Add logging when initializing a volume. Joffrey F 2016-02-10 16:49:50 -08:00
830a9fc118 Merge pull request #2889 from dnephin/fix_test_broken_on_master Joffrey F 2016-02-11 11:18:45 -08:00
532dffd688 Fix build section without context. Daniel Nephin 2016-02-10 13:32:04 -05:00
1e7dd2e740 Upgrade pyinstaller. Daniel Nephin 2016-02-11 13:10:29 -05:00
740329a131 Shm_size requires docker 1.10. Daniel Nephin 2016-02-11 13:50:23 -05:00
7bae4cdbb2 Merge pull request #2875 from aanand/fix-version-in-install-guide Daniel Nephin 2016-02-11 12:43:51 -05:00
23ab2c7e44 Merge pull request #2878 from dnephin/merge_build_args Aanand Prasad 2016-02-11 17:41:41 +00:00
b8f7bbb84e Merge pull request #2830 from nubs/master Aanand Prasad 2016-02-11 17:34:44 +00:00
a5d95612e0 Merge pull request #2881 from humitos/patch-1 Joffrey F 2016-02-11 09:28:08 -08:00
643166ae98 Updating Dockerfile Mary Anthony 2016-02-10 20:47:15 -08:00