55bd02f303
`scale` property should be merged according to standard scalar rules
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-05 13:10:50 -07:00
9cdbb953ba
Align status output for parallel_execute
...
Previously docker-compose would output lines that looked like:
Starting service ... done
Starting short ...
Starting service-with-a-long-name ... done
It's difficult to scan down this output and get an idea of what's happening.
Now the statuses are aligned, and output looks like this:
Starting service ... done
Starting short ...
Starting service-with-a-long-name ... done
To me, this is quite a bit easier to read.
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-07-03 16:24:07 -07:00
f2054f1a7d
Fix ports sorting on Python 3
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-27 12:50:41 -07:00
f3c1c8d158
ServicePort merge_field should account for external IP and protocol
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-12 11:42:29 -07:00
bd8d77feae
Add configs tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
36af86b9b2
Always convert port values in ServicePort to integer
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-05 15:51:22 -07:00
9a70db0889
Merge pull request #4864 from shin-/cred_spec_support
...
Add partial support for v3.3 credential_spec
2017-05-25 17:30:44 -07:00
73d7865da8
Add partial support (docker-compose config and warnings) for v3.3 credential_spec
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-25 14:54:46 -07:00
bf8498c488
Merge pull request #4861 from shin-/4825-cache-from
...
Merge all fields inside build dict
2017-05-25 14:44:56 -07:00
2ba9cd73d1
Network label mismatch now prints a warning instead of raising an error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:26:17 -07:00
062812e4aa
Merge all fields inside build dict
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 15:23:04 -07:00
fa77856c86
Add 3.3 format support
...
Remove build.labels field from 3.2 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 12:04:24 -07:00
9d78258b44
Fix test type
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
37de55865b
Add tests for the labels
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
7fca689efd
Update tests to show labels set to None
...
Signed-off-by: Colin Hebert <hebert.colin@gmail.com>
2017-05-23 12:03:36 -07:00
0043dc4fab
Add cpu_count, cpu_percent, cpus parameters.
...
Signed-off-by: Alexey Rokhin <arokhin@mail.ru>
2017-05-17 14:50:29 +03:00
babd7530c3
New network config whitelist option in unit test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-05 11:40:50 -07:00
3e66c68f9f
Fix external secrets serialization
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-01 14:42:17 -07:00
d0acefd450
Prevent NoneType error when remote IPAM options is None
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-26 13:34:45 -07:00
a0cf0a2009
Avoid rebinding tmpfs data volumes when recreating containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-25 15:10:57 -07:00
ae2cc6b5b8
Merge pull request #4721 from shin-/4376-unicode_file_paths
...
Convert paths to unicode in get_config_path_from_options if needed
2017-04-12 14:41:44 -07:00
1891b2b78c
Fix ServicePort.legacy_repr bug for `ext_ip::target` notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-11 14:45:14 -07:00
0f00aa4098
Convert paths to unicode in get_config_path_from_options if needed
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-10 17:45:06 -07:00
72a2ea9d86
Fix serializer bug (python 3)
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-07 16:54:31 -07:00
2506b72508
Merge pull request #4649 from shin-/bump_docker_py
...
Bump docker SDK dependency
2017-03-31 14:40:49 -07:00
48831a8d5f
Bump docker SDK dependency
...
Update invalid ports test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-28 16:15:34 -07:00
0e5acfa16c
Merge deploy key in service dicts
...
Update merge_service_dicts() to merge deploy mappings.
Compose file version 3 added the deploy key to service dicts
to specify configs related to Docker services.
Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-24 15:03:53 -06:00
0d1608c17c
Merge pull request #4662 from shin-/4651-tls-version-commandline
...
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
2017-03-23 15:16:03 -07:00
f55c9d4201
Recognize COMPOSE_TLS_VERSION env var in tls_config_from_options
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 17:27:11 -07:00
a0add5cc12
Fix ports reparsing for service extends
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 15:14:13 -07:00
611f058cde
Merge pull request #4632 from shin-/expanded-mounts
...
Add support for expanded mount/volume notation
2017-03-21 12:36:41 -07:00
69d0c0e3a0
Add support for expanded mount/volume notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 20:42:59 -07:00
0464476f08
Add unit test for image digests in config
...
Add two unit tests to validate that the denormalize_service_dict
function still works without passing a third argument for image_digest,
and correctly uses an image digest if one is provided.
Signed-off-by: King Chung Huang <kinghuang@mac.com>
2017-03-17 12:22:40 -06:00
2acf286ed6
Support V3.2
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-03-15 11:40:31 -04:00
a182300706
Merge pull request #4605 from shin-/4600-check-all-network-updates
...
Ensure network config matches remote for all properties
2017-03-14 13:56:43 -07:00
a6db78e5d4
Enable variable substitution in config.secrets
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 18:30:37 -07:00
963b672cbd
Ensure network config matches remote for all properties
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-13 15:48:38 -07:00
23b873c2ce
Add "secrets" section to docker-compose config output when applicable
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-10 14:32:55 -08:00
dd294ce9cc
Merge pull request #4591 from shin-/4580-log-api-error
...
Avoid encoding crash in log_api_error
2017-03-10 14:02:44 -08:00
beedceb66b
Merge pull request #4589 from shin-/dbonev-2586-specify-cwd-parameter
...
Ability to change working directory via a CLI flag
2017-03-09 15:44:27 -08:00
4e92b5bb85
Merge pull request #4590 from shin-/3474-self-referencing-ext-links
...
Prevent service to create a container if it is referencing itself in an external link
2017-03-09 15:36:48 -08:00
c3bcd59aeb
Avoid encoding crash in log_api_error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-09 15:23:13 -08:00
5ea9167334
Prevent service to create a container if it is referencing itself in an external link
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 18:29:09 -08:00
707210ae95
Ability to change working directory via a CLI flag
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2017-03-08 14:42:14 -08:00
ac12ab95c4
Rename COMPOSE_FILE_SEPARATOR -> COMPOSE_PATH_SEPARATOR
...
Add unit test
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-08 14:30:15 -08:00
d5a2d37d05
Properly resolve build args against host environment values
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-07 18:13:11 -08:00
449dcc9d7b
support --build-arg for build command
...
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
2017-03-07 17:09:35 -08:00
dd4e49ef98
Merge pull request #4563 from shin-/3723-mem-reservation
...
Add mem_reservation option to service config in 2.0 and 2.1 formats
2017-03-07 15:23:22 -08:00
e344fe9a9f
Merge pull request #4566 from shin-/eddwardo-run-v
...
Add --volumes flag to docker-compose run
2017-03-07 15:22:51 -08:00
0167aba2b7
Merge pull request #4541 from shin-/4502-expanded-port-syntax
...
Add support for expanded port syntax in 3.1 format
2017-03-06 18:32:52 -08:00
Joffrey F
Evan Shaw
Joffrey F
Colin Hebert
Alexey Rokhin
King Chung Huang
Daniel Nephin
Dimitar Bonev
Dat Tran