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
ec252350ae
Add mem_reservation option to service config in 2.0 and 2.1 formats
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:21:03 -08:00
c7b8278e78
Implemented dns_opt
...
Signed-off-by: George Lester <glester491@gmail.com>
2017-03-03 15:37:21 -08:00
83388ec31a
enable -v flag for docker-compose run command
...
Give user ability to attach volumes while running containers with
docker-compose run command. Example is given in the test implementation,
command is compatible with the one provided by docker engine.
Signed-off-by: Piotr Szymanski <skyleton@gmail.com>
2017-03-02 16:50:24 -08:00
b4f4ff1a6b
Merge pull request #4555 from kbh2o/abort_abort
...
Return exit code when exiting with --abort-on-container-exit
2017-03-01 17:51:58 -08:00
8d3c8be7d9
Merge pull request #4036 from nbarbey/master
...
Fix TypeError : unorderable types: str() < int()
2017-03-01 17:25:21 -08:00
6c3641fdb7
Returing 1 when a container exits with a non-zero exit code with --abort-on-container-exit is set. Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
...
Catching the first container to exit Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Addressing feedback and fixing tests Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Adding break and removing extra fixture files Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
Moving break Signed-off-by: Kevin Broadwater <kevin.broadwater@gmail.com>
2017-03-01 17:08:26 -08:00
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
5ff3037aa8
Merge pull request #4428 from edsrzf/parallel-pull
...
Pull services in parallel
2017-03-01 14:38:22 -08:00
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
7e8dcc847b
Merge pull request #4529 from shin-/3528-invalid-service-name
...
Detect the service that causes the invalid service name error
2017-02-24 17:47:41 -08:00
e29e3f8da4
Test for parallel_execute with limit
...
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-02-25 13:14:58 +13:00
05aa8c7285
Add optional limit to the number of parallel operations
...
Signed-off-by: Evan Shaw <evan@vendhq.com>
2017-02-24 21:53:38 +13:00
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
c64f7dde04
Fix failing unit tests
...
Signed-off-by: Joey Payne <jyapayne@gmail.com>
2017-02-21 19:01:30 -07:00
d20e3f3342
function-name-modification for tests/*
...
Signed-off-by: Aaron.L.Xu <likexu@harmonycloud.cn>
2017-02-16 15:25:20 +08:00
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
dc5b3f3b3e
Fix secrets config.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-10 17:11:24 -05:00
c092fa37de
Fix version 3.1
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-02-09 12:39:57 -05:00
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
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
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
e0c6397999
Implement secrets using bind mounts
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2017-01-31 09:53:16 -05:00
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
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
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
534b4ed820
Falsy values in COMPOSE_CONVERT_WINDOWS_PATHS are properly recognized
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 15:45:11 -08:00
bef2308530
Fix condition name in config tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-01-04 11:28:30 -08:00
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
04e5925a23
Use docker SDK 2.0
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-12-14 15:36:08 -08:00
716a6baa59
Implement 'healthcheck' option
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-11-18 14:47:02 +00:00
Joffrey F
Joffrey F
King Chung Huang
Daniel Nephin
Dimitar Bonev
Dat Tran
George Lester
Piotr Szymanski
kbroadwater
Evan Shaw
Joey Payne
Aaron.L.Xu
Aanand Prasad