f7d86d3194
Merge pull request #1944 from funkyfuture/issue-1921
...
Adds pause- and unpause-command to docopt's TLC
2015-09-08 14:05:27 -07:00
1c73ff33fe
Merge pull request #1990 from shin-/1975-fix
...
Remove or space out suspension dots after service name
2015-09-08 12:27:39 -07:00
abb0ab3f9d
Merge pull request #2001 from mnowster/entrypoint-allow-as-a-string
...
Allow entrypoint to be a list or string
2015-09-08 12:08:40 -07:00
b33dd3bc01
Fix error message and class name from Boot2Docker to DockerMachine
...
Signed-off-by: Lucas N. Munhoz <ln.munhoz@gmail.com>
2015-09-08 10:08:38 -03:00
866979c57b
Allow entrypoint to be a list or string
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-07 17:26:38 +01:00
d83d6306c9
Use custom container name in logs. Fixes #1851
...
Signed-off-by: Karol Duleba <mr.fuxi@gmail.com>
2015-09-07 14:03:00 +01:00
67957318ed
Added IPC spec to fields_schema.json
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-06 12:16:12 +10:00
2468235472
Added support for IPC namespaces, fixes GH-1689
...
Signed-off-by: Lachlan Pease <predatory.kangaroo@gmail.com>
2015-09-06 12:09:24 +10:00
6da7a9194c
Remove or space out suspension dots after service name for easier copy-pasting
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-04 17:43:12 -07:00
9da2bf3973
Merge pull request #1978 from aanand/use-docker-1.8.2-rc1
...
Test against Docker 1.8.2 RC1
2015-09-04 16:21:58 -07:00
10cb0c921a
Merge pull request #1963 from shin-/1923-catch-timeout
...
Exit gracefully when requests encounter a ReadTimeout exception.
2015-09-04 16:14:32 -07:00
536638aaae
Merge pull request #1962 from dnephin/use_enum_for_enum
...
Create a ConvergenceStrategy enum
2015-09-04 15:05:09 -07:00
d84ee667ad
Merge pull request #1983 from mnowster/update-testing-docs
...
Running a single test command updated
2015-09-04 12:28:08 -04:00
31e8137452
Running a single test command updated
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-04 17:23:22 +01:00
ff427e68ee
Merge pull request #1982 from mnowster/fix-trailing-white-space
...
Remove trailing white space from docs/index.md
2015-09-04 12:20:29 -04:00
0f60c783fa
Remove trailing white space
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-04 17:01:44 +01:00
0484e22a84
Add enum34 and use it to create a ConvergenceStrategy enum.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-04 10:45:53 -04:00
d4372bc98f
Merge pull request #1967 from charleswhchan/issue-1958
...
Fix #1958 . Remove release notes for old version of Docker Compose.
2015-09-04 11:44:33 +01:00
000bf1c16a
Fix #1958 . Remove release notes for old version of Docker Compose.
...
Replace by link to the latest CHANGELOG in GitHub.
Signed-off-by: Charles Chan <charleswhchan@users.noreply.github.com>
2015-09-03 21:18:26 -07:00
a1ec26435c
Test against Docker 1.8.2 RC1
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-03 18:30:50 -07:00
6a47fa066e
Merge pull request #1960 from dnephin/fix_smart_recreate_when_service_is_removed
...
Fix config_hash context to properly represent the service
2015-09-03 11:41:30 -07:00
c2f9ffad28
Merge pull request #1974 from dnephin/upgrade_requests
...
Bump requests to 2.7 to fix the ResponseNotReady() error
2015-09-03 11:38:17 -07:00
dcf2f3f28c
Merge pull request #1970 from mnowster/fix-expose-allowed-values
...
fix expose schema definition
2015-09-03 11:36:03 -07:00
9d7ad796a3
bump requests to 2.7 to fix the ResponseNotReady() error, and add a missing default for tox posargs
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-03 14:11:44 -04:00
db9f577ad6
Extract link names into a function.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-03 14:08:44 -04:00
187ad4ce26
Refactor network_mode logic out of Service.
...
Signed-off-by: Daniel Nephin <dnephin@docker.com>
2015-09-03 13:02:46 -04:00
c183e52502
Fixes #1757 - include all service properties in the config_dict()
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-03 12:04:38 -04:00
08ba857807
Cleanup some project logic.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-03 12:04:38 -04:00
e801981fed
Sort config keys
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-03 12:04:38 -04:00
ef56523883
Make external_links a regular service.option so that it's part of the config hash
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-03 12:04:38 -04:00
7326608369
expose array can contain either strings or numbers
...
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-03 16:44:01 +01:00
2073805bc1
Merge pull request #1952 from aanand/bundle-schema-json
...
Bundle schema.json in binary
2015-09-03 10:40:11 +01:00
ecea79fd4e
Bundle schema files
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-02 18:09:34 -07:00
6a95f6d628
custom timeout test rewrite
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 18:00:08 -07:00
b165ae07c9
Configure PyInstaller using docker-compose.spec
...
Signed-off-by: Aanand Prasad <aanand.prasad@gmail.com>
2015-09-02 17:47:14 -07:00
6baed6c354
Merge pull request #1965 from dnephin/fix_compose_up_attach
...
Attach to all containers when no service names are specified
2015-09-02 17:37:43 -07:00
f9c7346380
HTTP_TIMEOUT as importable constant for consistency
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 16:29:19 -07:00
b110bbe9e3
Refined error message when timeout is encountered.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 14:31:30 -07:00
e634fe3fd6
Deprecation warning when DOCKER_CLIENT_TIMEOUT is used
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 14:28:57 -07:00
027414cfc0
Merge pull request #1918 from dnephin/fix_scripts_test
...
Fix scripts/test and add to note about pre-commit hook to contributing
2015-09-02 14:28:51 -07:00
0060437f57
Merge pull request #1927 from mnowster/validate-extended-services
...
Validate and interpolate extended services
2015-09-02 13:41:21 -07:00
48466d7d82
Fix #1961 - docker-compose up should attach to all containers with no service names are specified, and add tests.
...
Signed-off-by: Daniel Nephin <dnephin@gmail.com>
2015-09-02 16:08:18 -04:00
80c9092999
Document COMPOSE_HTTP_TIMEOUT env config
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 12:52:48 -07:00
b54b932b54
Exit gracefully when requests encounter a ReadTimeout exception.
...
Signed-off-by: Joffrey F <joffrey@docker.com>
2015-09-02 11:54:20 -07:00
6a399a5b2f
Update tests to be compatible with validation
...
Some were missing build '.' from their dicts, others were the
incorrect type and one I've moved from integration to unit.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:43:52 +01:00
d31d24d19f
Work around some coupling of links, net & volume_from
...
This is minimal disruptive change I could make to ensure
the service integration tests worked, now we have some validation
happening.
There is some coupling/entanglement/assumption going on here.
Project when creating a service, using it's class method from_dicts
performs some transformations on links, net & volume_from, which
get passed on to Service when creating. Service itself, then performs
some transformation on those values. This worked fine in the tests before
because those options were merely passed on via make_service_dict.
This is no longer true with our validation in place. You can't pass to
ServiceLoader [(obj, 'string')] for links, the validation expects it to be
a list of strings. Which it would be when passed into Project.from_dicts
method.
I think the tests need some re-factoring but for now, manually deleting
keys out of the kwargs and then putting them back in for Service Creation
allows the tests to continue.
I am not super happy about this approach. Hopefully we can come back and
improve it.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:43:52 +01:00
9b8e404d13
Pass service_name to process_errors
...
Previously on Buffy... The process_errors was parsing a load of
ValidationErrors that we get back from jsonschema which included
assumptions about the state of the instance we're validating.
Now it's split in two and we're doing field separate to service,
those assumptions don't hold and we can't logically retrieve the
service_name from the error parsing when we're doing service schema
validation, have to explicitly pass this in.
process_errors is high on my list for some future re-factoring to help
make it a bit clearer, smaller state of doing things.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
f51a5431ec
Correct some schema field definitions
...
Now validation is split in two, the integration tests helped
highlight some places where the schema definition was incorrect.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
9979880c9f
Add in volume_driver
...
I'd missed out this field by accident previously.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
4b487e3957
Refactor extends back out of __init__
...
If make_service_dict is our factory function then we'll give it the
responsibility of validation/construction and resolving.
Signed-off-by: Mazz Mosley <mazz@houseofmnowster.com>
2015-09-02 15:42:38 +01:00
Aanand Prasad
Lucas N. Munhoz
Mazz Mosley
Karol Duleba
Lachlan Pease
Joffrey F
Daniel Nephin
mnowster
Charles Chan
Daniel Nephin