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

CHE-3686: fix docker machines addresses setting #3812

Merged
merged 1 commit into from
Jan 20, 2017

Conversation

garagatyi
Copy link

@garagatyi garagatyi commented Jan 19, 2017

What does this PR do?

Set internal machine address by CLI from CHE_IP.
Add and fix docs in che.env.
Change behavior of default machine server address evaluation
to be similar to the previous state.
Code cleanup.

What issues does this PR fix or reference?

Final addition to fix of #3686

Tests written?

Yes

Changelog

Fix docker machines addresses setting

@garagatyi
Copy link
Author

@amisevsk Please take a look too

Copy link
Contributor

@benoitf benoitf left a comment

Choose a reason for hiding this comment

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

launcher changes are not required as support has been dropped.

Set internal machine address by CLI from CHE_IP.
Add and fix docs in che.env.
Change behavior of default machine server address evaluation
to be similar to the previous state.
Code cleanup.
Signed-off-by: Alexander Garagatyi <[email protected]>
@benoitf
Copy link
Contributor

benoitf commented Jan 19, 2017

thanks

@garagatyi
Copy link
Author

@benoitf Thanks, I rebased this PR to resolve conflicts

@TylerJewell
Copy link

TylerJewell commented Jan 19, 2017

This issue has recently come up. And it should not be the situation where setting this by a user is required. Does this branch fix this issue?

https://github.com/codenvy/che-docs/issues/75#issuecomment-273801117

@garagatyi
Copy link
Author

@TylerJewell yes, I think this PR will solve that issue.

@amisevsk
Copy link
Contributor

@garagatyi LGTM. Thanks for cleaning up my code.

As long as the launcher/CLI sets CHE_DOCKER_IP appropriately, this implementation of DefaultServerEvaluationStrategy is simpler, but maybe a little more opaque (since the fact that CHE_DOCKER_IP is by a launch script, it's not immediately clear that value will always be set at runtime).

@codenvy-ci
Copy link

Copy link

@TylerJewell TylerJewell left a comment

Choose a reason for hiding this comment

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

I would like some time to review the modifications to Che.env, verify the networking docs and also have someone verify that they can start a new server on digital ocean by only setting Che host.

@garagatyi
Copy link
Author

@amisevsk It really depends on how che-server is launched and how CLI works(in case of launching using CLI). There is no guaranty that CLI will always set this property or that other vendor will not embed che-server without usage of CLI.

@TylerJewell TylerJewell added the kind/bug Outline of a bug - must adhere to the bug report template. label Jan 20, 2017
@TylerJewell
Copy link

@garagatyi - this is ok to merge. We hvae had multiple people run into these issues and have had to set CHE_DOCKER_EXTERNAL_* variables temporarily. Would you advise that we merge this in time for 5.1.2, a bug fix release for Monday?

@garagatyi
Copy link
Author

Yes, I think we can merge it. Should I merge it now?

@TylerJewell
Copy link

Yes, please - we should then do some tests on nightly on digital ocean tomorrow to verify that che starts easily with only CHE_HOST.

@garagatyi
Copy link
Author

ok, I'm merging this PR and dependent in Codenvy. Roman will be able to cherry pick into bug fix branch if needed.

@garagatyi garagatyi merged commit 6b46f73 into eclipse-che:master Jan 20, 2017
@garagatyi garagatyi deleted the CHE-3686 branch January 20, 2017 16:10
@TylerJewell TylerJewell added this to the 5.2.0 milestone Jan 23, 2017
@JamesDrummond JamesDrummond mentioned this pull request Feb 6, 2017
9 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Outline of a bug - must adhere to the bug report template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants