8155ddc7ad
Add support for custom names for networks, secrets, configs
...
Finalize v3.5 schema
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-06 16:48:14 -08:00
771bf5f7ea
Merge pull request #5436 from docker/5244-advanced-mount-support
...
Add support for mount syntax
2017-12-05 17:16:28 -08:00
79b20eb53f
Add support for mount syntax
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-12-05 16:21:49 -08:00
eabccda9d1
Merge pull request #5393 from summergirl21/3370-down-timeout
...
implement --timeout flag for docker-compose down
2017-12-05 12:32:43 -08:00
91bb682bdf
Merge pull request #5435 from summergirl21/5434-up-d-timeout-not-allowed
...
Raise error if up used with both -d and --timeout
2017-12-05 12:30:42 -08:00
16cc8437de
Raise error if up used with both -d and --timeout
...
Fix #5434
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-12-05 12:28:28 -06:00
9098a67394
Merge pull request #5410 from sethktaylor11/5374-build-memory
...
Adds support for a memory build-arg in docker-compose build.
2017-12-04 14:00:09 -08:00
a6cdd62726
Adds support for a memory flag to docker-compose build.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-12-03 13:59:32 -06:00
c36a2fb1ad
Added a label option to 'docker-compose run' and test.
...
Signed-off-by: Samantha Miller <samantha.a.miller123@gmail.com>
2017-11-28 18:43:00 -06:00
3b81e49c66
implement --timeout flag for docker-compose down
...
Fix #3370
Signed-off-by: Madeline Stager <stager.madeline@gmail.com>
2017-11-22 16:31:16 -06:00
819be19f7c
Miscellaneous test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-11-01 15:18:28 -07:00
b30cb77a7b
docker-compose exec doesn't have -e option ( fixes #4551 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-25 13:22:00 -07:00
803d5352e6
Add missing test constraint
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-18 17:27:23 -07:00
aaa0773b4b
Config command generates invalid volumes ( fixes #5176 )
...
Signed-off-by: Guillermo Arribas <garribas@gmail.com>
2017-10-16 12:06:04 -07:00
aab0891a07
Temporary xfails for engine bug
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-10-13 16:21:34 -07:00
dc838067fd
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-09-29 15:50:17 -07:00
40c05cfc1e
Add --no-start flag to up command. Deprecate create command.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-31 14:36:13 -07:00
390ba801a3
Fix exit code 0 upon parallel pull failure.
...
Signed-off-by: Aaron Nall <aronahl@hotmail.com>
2017-08-15 13:48:41 -07:00
22d9a258f4
v2 custom volume name support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-11 11:48:00 -07:00
dc6bb7020d
UCP 2.2.0 test fixes
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-10 11:08:20 -07:00
454b063fed
Keep no-ansi parameter in the CLI scope
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-08-09 19:00:23 -07:00
9502408ff0
Fix test issues with Engine 17.07 RC1
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-26 17:33:02 -07:00
6a4adb64f9
Some more test adjustments for Swarm support
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-20 16:39:03 -07:00
8f0ef26a73
Improved version comparisons throughout the codebase
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-11 17:40:53 -07:00
2b7ed24bc0
Fix override volume merging + add acceptance test
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 17:24:32 -07:00
259b96748c
Add support for service:name pid config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-07-03 16:15:20 -07:00
7a4c328c41
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-06-14 16:17:15 -07:00
e9b6cc23fc
Add --quiet parameter to docker-compose pull, using existing silent flag
...
Signed-off-by: Joel Barciauskas <barciajo@gmail.com>
2017-06-14 14:53:13 -07:00
8512b33e24
Remedy test failures
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-06-06 11:50:09 -07:00
972fe65830
Merge pull request #4860 from shin-/4845-rm-stop
...
Fix improper use of project.stop
2017-05-23 15:08:13 -07:00
244209814b
Fix improper use of project.stop
...
Add some better test coverage for rm --stop
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-23 12:38:54 -07:00
0d0c0454e9
Raise exception when override.yaml & override.yml coexist
...
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00
9334f29898
Fix for yaml extention does not work with override file
...
Signed-off-by: Eli Atzaba <eliat123@gmail.com>
2017-05-23 12:09:19 -07:00
59a4f554b9
Prevent dependencies rescaling when executing `docker-compose run`
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-05-12 17:39:56 -07:00
2ba4e5e8ec
Prevent `docker-compose scale` to be used with a v2.2 config file
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-21 11:42:18 -07:00
afb2b6c51c
Properly relay errors in execute_convergence_plan
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-18 12:53:43 -07:00
78ee612333
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-17 19:51:48 -07:00
c817dedef7
Repair bad imports
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-04-14 14:31:30 -07: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
69d0c0e3a0
Add support for expanded mount/volume notation
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2017-03-17 20:42:59 -07: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
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
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
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
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
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
Joffrey F
Joffrey F
Madeline Stager
Samantha Miller
Guillermo Arribas
Marc van den Hoogen
aronahl
Joel Barciauskas
Eli Atzaba
Dimitar Bonev
Piotr Szymanski
stefan