978e9cf38f
Fix script/clean on systems where `find` requires a path argument
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2016-01-08 13:10:05 +00:00
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
e7bba2affe
Merge pull request #2300 from dnephin/always_unicode_literal
...
Use "unicode_literals" in all files
2016-01-07 18:28:22 +00:00
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
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
ed87d1f848
Merge pull request #2421 from shin-/2110-compose_yml_v2
...
Add support for declaring named volumes in compose files
2016-01-07 16:45:58 +00:00
0bca8d9cb3
Add config and create to docs/reference
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:28:52 +01:00
4e75ed4231
Add missing --name flag to run reference doc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:15:11 +01:00
77d2aae72d
Fix typo in unpause reference doc
...
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
2016-01-06 21:14:30 +01:00
c7b71422c0
Fix extends with multiple files.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2016-01-06 13:30:40 -05:00
1dcdd98da4
Add TODO note to restore n-1 version testing after 1.10 release
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:24:58 -08:00
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
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
661519ac1c
Only test latest version in CI script
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:21:53 -08:00
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
ecef5d37a7
Add v2 configuration tests
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:21:53 -08:00
df6877a277
Use newer docker-py version
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:09:39 -08:00
abe145bbe7
Update config resolution to always use explicit version numbers
...
Also includes several bugfixes for resolution and validation.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:09:39 -08:00
b253efd8a7
Update docs to define and document new compose.yml file format
...
Add volume configuration reference section.
Signed-off-by: Joffrey F <joffrey@docker.com>
2016-01-05 15:09:39 -08:00
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
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
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
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
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
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
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
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
4017ea99fe
Merge pull request #2599 from dnephin/inject_project_name
...
Remove support for fig.yaml, FIG_FILE, and FIG_PROJECT_NAME
2016-01-05 12:29:38 +00:00
c1a21d2497
Merge pull request #2577 from TomasTomecek/easier-development
...
allow running compose from git
2016-01-05 12:27:35 +00:00
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
d4e913e42c
Fixing TODO visible in docs
...
Signed-off-by: Mary Anthony <mary@docker.com>
2015-12-31 19:04:38 -08:00
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
adde805829
allow running compose from git
...
with:
```
$ git clone docker/compose && cd compose
$ export PYTHONPATH="$PWD:$PYTHONPATH"
$ python -m compose --help
```
Signed-off-by: Tomas Tomecek <ttomecek@redhat.com>
2015-12-26 11:03:58 +01:00
ea8cc1c3dc
Merge pull request #2562 from thaJeztah/update-links
...
Update links
2015-12-21 08:31:39 -08:00
a2d2915a64
Merge pull request #2547 from seguins/1125-docker-compose-create
...
Add docker-compose create command.
2015-12-21 14:20:56 +00:00
5ed559fa0e
Update links
...
Updates some links to their new locations, and
replaces some http:// with https:// links.
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
2015-12-21 01:52:54 +01:00
12a08255b5
Merge pull request #2554 from aanand/clarify-rm-behaviour
...
Clarify behaviour of 'rm'
2015-12-18 16:42:05 +00:00
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
2e9a49b4eb
Clarify behaviour of 'rm'
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-12-17 17:50:45 +00:00
100d6f2fbb
Merge pull request #2552 from dbonev/2452-implement-cpu-quota
...
Added support for cpu_quota flag
2015-12-17 12:21:15 +00:00
a542041264
Added support for cpu_quota flag
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2015-12-16 21:25:30 +02:00
c8f63306e0
Merge pull request #2550 from dbonev/1236-restart-to-exit-with-non-zero
...
Start, restart, pause and unpause exit with non-zero if nothing to do
2015-12-16 15:25:34 +00:00
ae7e48ea2f
Merge pull request #2526 from dnephin/remove_extra_coverage_files
...
Ignore extra coverage files
2015-12-16 15:18:10 +00:00
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
5b32d32b2d
Merge pull request #2521 from jeanpralo/master
...
Add method to get more info about container status
2015-12-15 12:04:42 -08:00
c8f266b637
add restarting status for human_readable_state
...
Signed-off-by: Jean Praloran <jeanpralo@gmail.com>
2015-12-16 08:19:28 +13:00
a1217dc050
Merge pull request #2536 from dbonev/2345-incorrect-network-name
...
Incorrect network name shown in the log when no driver is specified
2015-12-11 14:39:36 -08:00
6d709caaa5
Fixes incorrect network name shown in the log when no driver is specified
...
Signed-off-by: Dimitar Bonev <dimitar.bonev@gmail.com>
2015-12-11 10:14:01 +02:00
1d3aeaaae7
Ignore extra coverge files
...
These files are created because we run acceptance tests in a subprocess.
They have the process id in their name, so they wont be removed by the
normal coverage cleanup on each run.
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-12-10 15:29:36 -08:00
bc09698897
Merge pull request #2527 from dnephin/fix_dns_config_option
...
Fix dns and dns_search when used strings and without extends.
2015-12-10 11:31:01 +00:00
Aanand Prasad
Dimitar Bonev
Daniel Nephin
Vincent Demeester
Joffrey F
Mary Anthony
Tomas Tomecek
Daniel Nephin
Sebastiaan van Stijn
Stéphane Seguin
Jean Praloran