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
eab1ee0eaf
Support 'nocopy' mode for expanded volume syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-23 15:17:23 -07: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
732bf52a4e
The interval is too damn small
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-22 14:09:50 -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
01fa147183
Merge pull request #4040 from rawkode/feature/allow-running-containers-to-be-deleted
...
Allowing running containers to be rm'd by stop flag
2017-03-06 18:34:19 -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
d75726db21
Merge pull request #4561 from shin-/JesusTinoco-3501-add-image-command-option
...
Add images command
2017-03-06 18:28:34 -08:00
4dca6adeb1
Merge pull request #4562 from shin-/lindt-bugfix/unnamed_volumes_do_not_support_mode_suffix
...
Do not add mode to anonymous volumes in config output
2017-03-06 18:21:36 -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
bf7c2bc0f8
Use create_host_file in run -v tests to ensure file availability
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 18:13:16 -08:00
b454268f93
Merge pull request #4565 from shin-/onorua-pids-limit
...
Add pids_limit to service config
2017-03-06 18:09:53 -08:00
8f8678987b
Improve readability of code and output for the images command
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 15:56:41 -08:00
83728d2bcc
Do not add mode in volume representation if it's not a host binding
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:43:29 -08:00
b6fb3f2634
pids_limit not yet supported for swarm services - removing from v3 format
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 14:32:04 -08:00
7512dccaa8
Add dns_opt to 2.1 schema
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-06 13:28:52 -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
6a151aac04
introducing pids_limit, fix for #4178
...
Signed-off-by: Yaroslav Molochko <y.molochko@anchorfree.com>
2017-03-02 16:44:26 -08:00
11329e779b
added failing test that ensures that named volume will not be printed with a mode suffix
...
Signed-off-by: stefan <think@hotmail.de>
2017-03-02 15:26:40 -08:00
90beeaf21c
3501 - Remove a test and fix other
...
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00
33f510b340
3501 - Add a new command option (images)
...
Signed-off-by: Jesus Rodriguez Tinoco <jesus.rodriguez.tinoco@gmail.com>
2017-03-02 15:00:55 -08:00
6986a994a8
Merge branch 'forward-exit' of https://github.com/TheClimateCorporation/compose into TheClimateCorporation-forward-exit
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-01 18:04:48 -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
1a77a7fd44
Merge pull request #3756 from nkovacs/2419-run-rm-volumes
...
Remove anonymous volumes when using run --rm.
2017-03-01 16:38:46 -08:00
eca3146c9c
Merge pull request #3617 from dguo/help-nonexistent-command
...
Handle giving help a nonexistent command
2017-03-01 16:31:37 -08:00
Joffrey F
Joffrey F
King Chung Huang
Daniel Nephin
Dimitar Bonev
Dat Tran
George Lester
Piotr Szymanski
Yaroslav Molochko
stefan
Jesus Tinoco
kbroadwater