tyler.durden/compose
1
0
Fork 0
mirror of https://github.com/docker/compose.git synced 2025-04-08 17:05:13 +02:00
Code Issues Packages Projects Releases Wiki Activity
3,807 Commits 23 Branches 268 Tags
Commit Graph

975 Commits

Author SHA1 Message Date
Aanand Prasad
85a210d9eb Increase timeout on signal-handling tests 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-13 20:34:07 +00:00
Joffrey F
d601199eb5 Normalize external_name 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-13 12:07:08 -08:00
Evgeniy Dobrohvalov
bf48a781db Add flag for stops all containers if any container was stopped. 
Signed-off-by: Evgeniy Dobrohvalov <scipetr@gmail.com>
 2016-01-13 13:12:09 +03:00
Joffrey F
f774422d18 Test Volume.exists() behavior 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:58:24 -08:00
Joffrey F
9cb58b796e Implement ability to specify external volumes 
External volumes are created and managed by the user.
They are not namespaced.
They are expected to exist at the beginning of the up phase.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 16:53:49 -08:00
Joffrey F
05935b5e54 Don't recreate pre-existing volumes. 
During the initialize_volumes phase, if a volume using the
non-namespaced name already exists, don't create the namespaced
equivalent.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-12 15:42:42 -08:00
Jonathan Stewmon
5d8c2d3cec add support for stop_signal to compose file 
Signed-off-by: Jonathan Stewmon <jstewmon@rmn.com>
 2016-01-12 17:21:49 -06:00
Dimitar Bonev
3a46abd17f Allowed port range in exposed ports 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-13 00:13:04 +02:00
Dimitar Bonev
2f07e2ac36 Ulimits are now merged into extended services 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-12 23:59:23 +02:00
Aanand Prasad
70cce961a8 Don't allow links or external_links in v2 files 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:45 +00:00
Aanand Prasad
a027a0079c Use networking for version 2 Compose files 
- Remove --x-networking and --x-network-driver
- There's now no way to set a network driver - this will be added back
  with the 'networks' key

Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:29:40 +00:00
Aanand Prasad
1a66543461 Make the default network name '{project name}_default' 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Aanand Prasad
b786b47bc8 Remove version checks from tests requiring API v1.21 
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
 2016-01-12 21:08:28 +00:00
Daniel Nephin
e98ab0e534 Allow both image and build together. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-12 14:10:00 -05:00
Daniel Nephin
304a44aeab Merge pull request #2585 from dnephin/short_signal_handlers 
Fix signal handlers by moving shutdown logic out of handler
 2016-01-12 12:55:53 -05:00
Aanand Prasad
52e50a9d9a Merge pull request #2626 from shin-/dbonev-2503-move-logging-config-under-separate-key 
Move logging config under separate key in v2 compose files
 2016-01-12 15:21:10 +00:00
Aanand Prasad
063a25ae7d Merge pull request #2392 from dnephin/docker_compose_events 
docker-compose events
 2016-01-12 11:45:27 +00:00
Joffrey F
ca634649bb Changed logging override test into integration test 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-11 16:25:19 -08:00
Daniel Nephin
d3cd038b84 Update event field names to match the new API fields. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-11 11:51:17 -05:00
Joffrey F
46585fb8e1 Support legacy logging options format 
Additional test for legacy compose file.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-08 14:37:07 -08:00
Daniel Nephin
fc57fc1dc1 Merge pull request #2609 from dnephin/dont_warn_on_container_volume 
Don't warn when the container volume is a compose option
 2016-01-08 17:18:02 -05:00
Daniel Nephin
ab98c70dd1 Merge pull request #2612 from dnephin/merge_extends_from_multiple_files 
Fix extends with multiple files
 2016-01-08 17:17:41 -05:00
Joffrey F
21aae13e77 Move logging config changes to v2 spec 
Reorganize JSON schemas
Update fixtures
Update service validation function

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-08 13:21:45 -08:00
Daniel Nephin
d1d3969661 Add docker-compose event 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-08 13:43:30 -05:00
Dimitar Bonev
ed5f7bd394 log_driver and log_opt moved to logging key. 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2016-01-08 01:54:45 +02:00
Daniel Nephin
bf1552da79 Use json to encode invalid values in configuration errors so that the user sees a proper repr of the value. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:24 -05:00
Daniel Nephin
475a091768 Update pre-commit config to enforace that future imports exist in all files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-07 13:09:03 -05:00
Daniel Nephin
c7b71422c0 Fix extends with multiple files. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-06 13:30:40 -05:00
Joffrey F
a7689f3da8 Handle volume driver change error in config. 
Assume version=1 if file is empty in get_config_version
Empty files are invalid anyway, so this simplifies the algorithm
somewhat.
https://github.com/docker/compose/pull/2421#discussion_r47223144

Don't leak version considerations in interpolation/service validation

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:22:13 -08:00
Joffrey F
f3a9533dc0 version no longer optional arg for process_config_file 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:54 -08:00
Joffrey F
ec5111f1c2 Volumes are now prefixed with the project name 
When created through the compose file, volumes are prefixed
with the name of the project they belong to + underscore,
similarly to how containers are currently handled.

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
ecef5d37a7 Add v2 configuration tests 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:21:53 -08:00
Joffrey F
b4be7b870f Add support for declaring named volumes in compose files 
* Bump default API version to 1.21 (required for named volume management)
* Introduce new, versioned compose file format while maintaining support
  for current (legacy) format
* Test updates to reflect changes made to the internal API

Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
4bf2f8c4f9 Fix lookup of linked containers for API version 1.20 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
97fe2ee40c Don't preserve host volumes on container recreate. 
Fixes a regression after the API changed to use Mounts.

Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
c64b7cbb10 Ignore errors from API about not being able to kill a container. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Joffrey F
afab5c76ea Update service volume tests to use mounts key 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Joffrey F
3bdcc9d954 Update service tests to use mounts instead of volumes 
Signed-off-by: Joffrey F <joffrey@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
73de81b51c Upgrade tests to use new Mounts in container inspect. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 15:09:39 -08:00
Daniel Nephin
ad9011ed96 Don't warn when the container volume is specified as a compose option. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-05 17:30:27 -05:00
Daniel Nephin
2acc29cf1c Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2016-01-04 15:37:21 -05:00
Daniel Nephin
778c213dfc Fix signal handlers by moving shutdown logic out of handler. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-30 11:21:20 -05:00
Aanand Prasad
a2d2915a64 Merge pull request #2547 from seguins/1125-docker-compose-create 
Add docker-compose create command.
 2015-12-21 14:20:56 +00:00
Stéphane Seguin
3c76d5a467 Add docker-compose create command. 
Closes #1125

Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-18 08:53:26 +01:00
Dimitar Bonev
a542041264 Added support for cpu_quota flag 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-16 21:25:30 +02:00
Dimitar Bonev
bc843d6758 Start, restart, pause and unpause exit with non-zero if nothing to do 
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
 2015-12-15 23:11:11 +02:00
Daniel Nephin
fa3528ea25 Fix dns and dns_search when used strings and without extends. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-09 16:32:39 -08:00
Stéphane Seguin
999d15b225 Remove unused functions in service 
Signed-off-by: Stéphane Seguin <stephseguin93@gmail.com>
 2015-12-08 21:11:05 +01:00
Daniel Nephin
437f3f8adb Add docker-compose config subcommand. 
Signed-off-by: Daniel Nephin <dnephin@docker.com>
 2015-12-07 18:51:01 -08:00
Aanand Prasad
ecf2dd11f9 Merge pull request #2467 from dnephin/remove_migrate_to_labels 
Remove migrate-to-labels.
 2015-12-07 14:31:23 +00:00