tyler.durden
/
compose
mirror of https://github.com/docker/compose.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
4,294 Commits 21 Branches 265 Tags 54 MiB
Commit Graph

205 Commits

Author SHA1 Message Date
Joffrey F 29c02ef598 Fix bad rebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:40:53 -08:00
Joffrey F 99e9e32d7e Add support for custom names for networks, secrets, configs 
Finalize v3.5 schema

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Joffrey F 084818ce2b Add support for mount syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:34:46 -08:00
Madeline Stager 58f2f10d49 Raise error if up used with both -d and --timeout 
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-12-06 17:34:46 -08:00
Samantha Miller 20a393d4f9 Adds support for a memory flag to docker-compose build. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-06 17:34:46 -08:00
Samantha Miller 7835a07550 Added a label option to 'docker-compose run' and test. 
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
 2017-12-06 17:34:46 -08:00
Madeline Stager 6b0138d70f implement --timeout flag for docker-compose down 
Fix #3370

Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
 2017-12-06 17:34:46 -08:00
Guillermo Arribas a1a6fb485b docker-compose exec doesn't have -e option (fixes #4551) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-12-06 17:32:25 -08:00
Joffrey F dfa7380f37 Add missing test constraint 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-12-06 17:32:25 -08:00
aronahl 2daf3628e9 Fix exit code 0 upon parallel pull failure. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2017-12-06 17:29:49 -08:00
Joel Barciauskas 5844dbb38e Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-12-06 17:26:45 -08:00
Joffrey F 9f80ec548e Miscellaneous test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-11-01 14:46:17 -07:00
Joffrey F 63b5722b16 flake8 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-17 13:36:18 -07:00
Guillermo Arribas b9bae89f1d Config command generates invalid volumes (fixes #5176) 
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
 2017-10-16 16:46:21 -07:00
Joffrey F aecd0a9483 Temporary xfails for engine bug 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:21 -07:00
Marc van den Hoogen 38073bbd9f Add shm_size to build-options (issue #3866) 
* Add shm_size to build configuration
 * Make it possible to enlarge/customize shm size during build
 * Value in bytes, or use string like "512M" or "1G" ...
 * Add to compose format 2.3 and (provisionally) >=3.5 format
 * Add automated test for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Made unit tests compatible with previously added shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Also support shm_size build-opt when conf override

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Automated test for shm_size build-option

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Schema 3.4, add shm_size to schema 2.3, updated const.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Corrected typo in config_schema_v3.4

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Add support for g/m/k units for shm_size in build-opts

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>

Reorder imports in service.py

Signed-off-by: Marc van den Hoogen <marc@vandenhoogen.eu>
 2017-10-16 16:46:21 -07:00
Joffrey F 376389d7a5 Add --no-start flag to up command. Deprecate create command. 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-10-16 16:46:18 -07:00
Joel Barciauskas 2eed6939f1 Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-10-16 16:45:42 -07:00
aronahl f1baee3292 Fix exit code 0 upon parallel pull failure. 
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 41a5a4a321 v2 custom volume name support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F b893797e03 UCP 2.2.0 test fixes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 7882f1fb06 Keep no-ansi parameter in the CLI scope 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F 73fd0abd5b Fix test issues with Engine 17.07 RC1 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-08-21 13:09:19 -07:00
Joffrey F c923ea1320 Some more test adjustments for Swarm support 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-26 16:50:14 -07:00
Joffrey F 56a23bfcd2 Improved version comparisons throughout the codebase 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F ec4ba7752f Fix override volume merging + add acceptance test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F 41976b0f7f Add support for service:name pid config 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joffrey F a0119ae1a5 Rewriting tests to be UCP/Swarm compatible 
- Event may contain more information in some cases.
  Don't assume order or format
- Don't assume ports are always exposed on 0.0.0.0 by default
- Absence of HostConfig in a create payload sometimes causes an error at the
  engine level
- In Swarm, volume names are prefixed by "<node_name>/"
- When testing against Swarm, the default network driver is overlay
- Ensure custom test networks are always attachable
- Handle Swarm network names
- Some params moved to host config in recent (1.21+) version
- Conditional test skips for Swarm environments

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-07-13 17:37:26 -07:00
Joel Barciauskas 59c4c2388e Add --quiet parameter to docker-compose pull, using existing silent flag 
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
 2017-07-13 17:37:26 -07:00
Joffrey F a85dddf83d Remedy test failures 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-06-06 15:26:49 -07:00
Joffrey F d29ed0d3e4 Fix improper use of project.stop 
Add some better test coverage for rm --stop

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Eli Atzaba 88fa8db79a Raise exception when override.yaml & override.yml coexist 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-30 15:23:00 -07:00
Eli Atzaba d0b80f537b Fix for yaml extention does not work with override file 
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
 2017-05-30 15:23:00 -07:00
Joffrey F 9daced4c04 Prevent dependencies rescaling when executing `docker-compose run` 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F 1be40656a1 Prevent `docker-compose scale` to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F ffb8f9f1b4 Implement --scale option on up command, allow scale config in v2.2 format 
docker-compose scale modified to reuse code between up and scale

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-05-30 15:23:00 -07:00
Joffrey F ef40e3c6b9 Prevent `docker-compose scale` to be used with a v2.2 config file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F 457c16a7b1 Properly relay errors in execute_convergence_plan 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F c8a7891cc8 Implement --scale option on up command, allow scale config in v2.2 format 
docker-compose scale modified to reuse code between up and scale

Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-21 14:49:04 -07:00
Joffrey F c817dedef7 Repair bad imports 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-04-14 14:31:30 -07:00
Joffrey F eab1ee0eaf Support 'nocopy' mode for expanded volume syntax 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-23 15:17:23 -07:00
Joffrey F 69d0c0e3a0 Add support for expanded mount/volume notation 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2017-03-17 20:42:59 -07:00
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 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
Joffrey F 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
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
Joffrey F d75726db21 Merge pull request #4561 from shin-/JesusTinoco-3501-add-image-command-option 
Add images command
 2017-03-06 18:28:34 -08:00
Joffrey F 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
Joffrey F 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
Joffrey F 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