Dimitar Bonev
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
Joffrey F
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
Dat Tran
449dcc9d7b
support --build-arg for build command
...
Signed-off-by: Dat Tran <dattran.vn01@gmail.com>
2017-03-07 17:09:35 -08:00
Joffrey F
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
George Lester
c7b8278e78
Implemented dns_opt
...
Signed-off-by: George Lester <glester491@gmail.com>
2017-03-03 15:37:21 -08:00
Joffrey F
8d3c8be7d9
Merge pull request #4036 from nbarbey/master
...
Fix TypeError : unorderable types: str() < int()
2017-03-01 17:25:21 -08:00
Joffrey F
9f8e01fa94
Merge pull request #3543 from milin/master
...
Replace assertEquals with assertEqual in unittests since the former is getting dep…
2017-03-01 16:27:36 -08:00
Joffrey F
11788ef0ff
Add support for expanded port syntax in 3.1 format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 12:10:51 -08:00
Joffrey F
8b92049432
Detect the service that causes the invalid service name error
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-22 16:21:23 -08:00
Joffrey F
abce83ef25
Fix config
command output with service.secrets section
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-13 16:51:50 -08:00
Daniel Nephin
dc5b3f3b3e
Fix secrets config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-10 17:11:24 -05:00
Daniel Nephin
c092fa37de
Fix version 3.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-09 12:39:57 -05:00
Joffrey F
951497c0f2
Merge pull request #4419 from shin-/4418-healthcheck-extends
...
Don't re-parse healthcheck values coming from extended services
2017-02-03 12:24:53 -08:00
Joffrey F
cf43e6edf7
Don't re-parse healthcheck values coming from extended services
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-02 14:50:53 -08:00
Joffrey F
7e8958e6ca
Add missing comma in DOCKER_CONFIG_KEYS list
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-02-01 16:40:43 -08:00
Joffrey F
e10d1140b9
Convert time data back to string values when serializing config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-26 11:59:22 -08:00
Joffrey F
1a02121ab5
depends_on merge now retains condition information when present
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-18 17:52:03 -08:00
Joffrey F
2df31bb13c
Provide valid serialization of depends_on when format is not 2.1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-11 16:25:40 -08:00
Joffrey F
bef2308530
Fix condition name in config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
Joffrey F
04394b1d0a
Expand depends_on to allow different conditions (service_start, service_healthy)
...
Rework "up" and "start" to wait on conditional state of dependent services
Add integration tests
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
Aanand Prasad
716a6baa59
Implement 'healthcheck' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-18 14:47:02 +00:00
Aanand Prasad
d717c88b6e
Support version 3.0 of the Compose file format
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-16 16:07:02 +00:00
Aanand Prasad
ba249e5179
Test that values in 'environment' override env files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-09 15:10:27 +00:00
Joffrey F
10417eebd7
Fix logging dict merging
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-11-03 17:22:31 -07:00
Nicolas Barbey
086ae04b9e
Fix TypeError : unorderable types: str() < int()
...
While merging list items into a set, strings and ints are compared which is not possible.
We cast everything to strings to avoid the issue.
The issue was seen with python 3.5 while overriding configuration files
with heterogenous port types (int in one file, string in another).
Signed-off-by: Nicolas Barbey <nicolas.a.barbey@gmail.com>
2016-10-18 12:01:00 +02:00
Joffrey F
14716bc2da
Merge branch 'master' of https://github.com/dbdd4us/compose into dbdd4us-master
2016-10-17 14:09:09 -07:00
Joffrey F
a5c1e4b0cd
Merge pull request #3991 from shin-/3906-isolation-config
...
Add support for "isolation" in config
2016-10-17 11:02:11 -07:00
dbdd
bdcce13f4a
add support for creating volume and network with label definition
...
Signed-off-by: dbdd <wangtong2712@gmail.com>
2016-10-12 10:35:14 +08:00
Joffrey F
0603b445e2
Properly merge logging dictionaries in overriding configs
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-10-10 15:39:05 -07:00
Joffrey F
dc8a39f70d
Add support for "isolation" in config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-28 15:31:58 -07:00
Joffrey F
f65f89ad8c
Merge pull request #3653 from shin-/3637-link-local-ips
...
Add support for link-local IPs in service.networks definition
2016-09-22 11:58:29 -07:00
Joffrey F
fd254caa68
Add support for link-local IPs in service.networks definition
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-09-15 14:55:14 -07:00
George Lester
dada36f732
Supported group_add
...
Signed-off-by: George Lester <glester491@gmail.com>
2016-09-11 23:10:49 -07:00
Jean-François Roche
d824cb9b06
Add support for swappiness constraint
...
Run a service using `docker run --memory-swappiness=0` (see
https://docs.docker.com/engine/reference/run/ )
refs #2383
Signed-off-by: Jean-François Roche <jfroche@affinitic.be>
2016-08-16 11:02:51 +02:00
Jonathan Giannuzzi
83f35e132b
Add support for creating internal networks
...
Signed-off-by: Jonathan Giannuzzi <jonathan@giannuzzi.be>
2016-07-11 11:34:01 +02:00
George Lester
6fe5d2b543
Implemented oom_score_adj
...
Signed-off-by: George Lester <glester491@gmail.com>
2016-07-05 23:43:32 -07:00
Aanand Prasad
21f20cbc9b
Merge pull request #3449 from Andrey9kin/ready/3281
...
Fix #3281 : Unexpected result when using build args with default values
2016-06-14 08:05:07 -07:00
Joffrey F
60f7e021ad
Fix split_path_mapping behavior when mounting "/"
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-06-13 15:32:10 -07:00
Milind Shakya
11a2eab549
Replace assertEquals with assertEqual since the former is getting deprecated soon. Also, fix pep8 E309.
...
Signed-off-by: Milind Shakya <sh.milind@gmail.com>
2016-06-02 16:35:23 -07:00
Andrey Devyatkin
a67ba5536d
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-28 11:39:41 +02:00
Andrey Devyatkin
c148849f0e
Fix #3281 : Unexpected result when using build args with default values
...
Fix the issue when build arg is set to None instead of empty string. Usecase:
cat docker-compose.yml
.... args:
- http_proxy
- https_proxy
- no_proxy
If http_proxy, https_proxy, no_proxy environment variables are not defined then http_proxy,
https_proxy, no_proxy build args will be set to string None which breaks all downloads
With this change undefined build args will be set to empty string instead of string None
Signed-off-by: Andrey Devyatkin <andrey.a.devyatkin@gmail.com>
2016-05-27 20:16:52 +02:00
Joffrey F
842e372258
Eliminate duplicates when merging port mappings from config files
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-20 15:28:35 -07:00
Joffrey F
2b5b665d3a
Add test for path mapping with Windows containers
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-19 14:53:37 -07:00
Joffrey F
db0a6cf2bb
Always use the Windows version of splitdrive when parsing volume mappings
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-05-17 16:33:59 -07:00
johnharris85
6d2805917c
Account for aliased links
...
Fix failing tests
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 15:25:06 -04:00
johnharris85
377be5aa1f
Adding tests
...
Signed-off-by: John Harris <john@johnharris.io>
2016-04-17 14:01:06 -04:00
Joffrey F
12ad3ff301
Injecting os.environ in Environment instance happens outside of init method
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:28 -07:00
Joffrey F
36f1b4589c
Limit occurrences of creating an environment object.
...
.env file is always read from the project_dir
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
Joffrey F
d55fc85fea
Added default env file test.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00
Joffrey F
1801f83bb8
Environment class cleanup
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-03-24 10:57:01 -07:00