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

Replace dockerVersion with dockerApiVersion #1296

Merged
merged 7 commits into from
Jan 18, 2020

Conversation

rodrigorn
Copy link
Contributor

Hello!
I have the exact same issue as #1294 according to the api version matrix these could fix this problem

@lightbend-cla-validator
Copy link

Hi @rodrigorn,

Thank you for your contribution! We really value the time you've taken to put this together.

Before we proceed with reviewing this pull request, please sign the Lightbend Contributors License Agreement:

http://www.lightbend.com/contribute/cla

@rodrigorn
Copy link
Contributor Author

Hi! I have signed the CLA

@rodrigorn
Copy link
Contributor Author

Hi @muuki88 I hope this might be useful regarding your question

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for taking the time to make this pull requests and sorry for the late response 🤗 ( christmas vacation ).

Unfortunately we can not just rename this setting in a minor/patch release as this breaks all downstream users. We must

  • introduce a new setting dockerApiVersion
  • deprecate the old setting
  • introduce a new setting to switch between "server version" and "api version" compatibility mode

I'm really in favor of using the API version instead of the server version as this looks semantically correcter. 😄

@rodrigorn
Copy link
Contributor Author

Thanks for taking the time to make this pull requests and sorry for the late response hugs ( christmas vacation ).

Don't worry, hope you enjoyed your vacation

Unfortunately we can not just rename this setting in a minor/patch release as this breaks all downstream users. We must

* introduce a new setting dockerApiVersion

* deprecate the old setting

You are right, I just wanted to see what would imply this change. I'll revert those changes

* introduce a new setting to switch between "server version" and "api version" compatibility mode

What about just introduce the new setting dockerApiVersion and test both options on DockerSupport?

Thanks for your feedback!

Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for the fixes 🤗

One hint how to fix the binary incompatibility issues.

It would also be nice to document this new setting along with
the behaviour in the docker.rst 😃

@rodrigorn rodrigorn requested a review from muuki88 January 15, 2020 22:02
Copy link
Contributor

@muuki88 muuki88 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Awesome 🎉

There's one test failure left: https://travis-ci.org/sbt/sbt-native-packager/jobs/637662841#L1167-L1168

I didn't had the time to dig deeper, but my wild guess is that either some boolean logic doesn't workout as expected or the server version check was wrong for a specific feature, while the new api version is correct (or the other way round).

Feel free to ask if you need any help on how to run the tests. The Developer Guidelines contain some examples on how to do things 😄

@rodrigorn
Copy link
Contributor Author

The test was overriding the server version expecting the plugin to fail, since the api version was still correct the plugin wasn't failing (I think this is the behavior that we are trying to achieve with this pull request). I just overrode the api version too to get the test to pass, but let me know if you want me to add more tests to check other use cases.

@muuki88 muuki88 merged commit 48fbde3 into sbt:master Jan 18, 2020
@muuki88
Copy link
Contributor

muuki88 commented Jan 18, 2020

Thanks for all your time and thinking you put into this PR 🤗 I'll release this next week.

@muuki88
Copy link
Contributor

muuki88 commented Jan 20, 2020

Released 1.6.0. Thanks again @rodrigorn 🤗

@rodrigorn
Copy link
Contributor Author

Thanks to you @muuki88!!

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.

3 participants