Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

WIP: Bump 1.5.2 #2491

Merged
merged 36 commits into from
Dec 4, 2015
Merged

WIP: Bump 1.5.2 #2491

merged 36 commits into from
Dec 4, 2015

Conversation

dnephin
Copy link

@dnephin dnephin commented Dec 3, 2015

No description provided.

dnephin and others added 26 commits December 2, 2015 16:56
Credit to @funkyfuture for the first PR addressing the clarification.
docker#1767

Signed-off-by: Mazz Mosley <[email protected]>
…ars to compose container

Signed-off-by: Simon van der Veldt <[email protected]>
…objects.

Previously these empty objects would hit a bug in splitting objects causing it crash.
With this fix the empty objects are returned properly.

Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
project name is already normalized to a valid name before creating a service.

Signed-off-by: Daniel Nephin <[email protected]>
Includes creating a new compose.config.types module for all the domain objects.

Signed-off-by: Daniel Nephin <[email protected]>
At the same time, moves extra_hosts validation to the config module.

Signed-off-by: Daniel Nephin <[email protected]>
This removes the last of the old service.ConfigError

Signed-off-by: Daniel Nephin <[email protected]>
@aanand
Copy link

aanand commented Dec 3, 2015

Nice. Any idea what's going on with the test failures? I guess the env_file fixes depend on a big chain of refactoring commits, so it's a bit of a tangle. Maybe something got left out?

dnephin and others added 3 commits December 3, 2015 11:05
Split env resolving into two phases. The first phase is to expand the paths
of env_files, which is done before merging extends. Once all files are merged
together, the final phase is to read the env_files and use them as the base
for environment variables.

Signed-off-by: Daniel Nephin <[email protected]>
Signed-off-by: Jonas Eckerström <[email protected]>
aanand and others added 6 commits December 3, 2015 11:05
We were essentially only testing that *at least one* of the invalid
values fails the validation check, rather than that *all* of them fail.

Signed-off-by: Aanand Prasad <[email protected]>
- The `raises` kwarg to the `cls_check` decorator was being used
  incorrectly (it should be an exception class, not an object).

- We need to check for `error.cause` and get the message out of the
  exception object.

NB: The particular case where validation fails in the case of `ports` is
only when ranges don't match in length - no further validation is
currently performed client-side.

Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Aanand Prasad <[email protected]>
Signed-off-by: Daniel Nephin <[email protected]>
@dnephin
Copy link
Author

dnephin commented Dec 3, 2015

I figured out the test failure. There was a refactoring done between two sets of changes which added env_file to the list of fields to merge in merge_services. I missed that change when resolving a merge conflict. I've added it back in, and it looks like test are passing now!

Signed-off-by: Daniel Nephin <[email protected]>
@dnephin
Copy link
Author

dnephin commented Dec 3, 2015

Fixed the wording in the changelog as well. Once janky runs green I think this is ready to go

dnephin added a commit that referenced this pull request Dec 4, 2015
@dnephin dnephin merged commit 8f48fa4 into docker:release Dec 4, 2015
@dnephin dnephin deleted the bump-1.5.2 branch December 4, 2015 01:11
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

8 participants