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

Make sure the Docker Host IP address is retrieved correctly when running inside docker #541

Merged
merged 4 commits into from
Jan 12, 2018
Merged

Make sure the Docker Host IP address is retrieved correctly when running inside docker #541

merged 4 commits into from
Jan 12, 2018

Conversation

jochenhebbrecht
Copy link
Contributor

More details can be found here: #479 (comment)

.toString();
LogToStringContainerCallback loggingCallback = new LogToStringContainerCallback();
client.logContainerCmd(id).withStdOut(true)
.withStdErr(true)
Copy link
Member

Choose a reason for hiding this comment

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

I think withStdErr is not needed here

client.logContainerCmd(id).withStdOut(true)
.withStdErr(true)
.withFollowStream(true)
.withTailAll()
Copy link
Member

Choose a reason for hiding this comment

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

tail=all is the default, can also remove it

@kiview
Copy link
Member

kiview commented Jan 11, 2018

@bsideup I'm afraid this fix won't help with the flaky log behavior regarding LogMessageWaitStrategy, since we use a different class there (LogUtils) and are already using withFollowStream(true):

Or did you have another idea?

@bsideup
Copy link
Member

bsideup commented Jan 11, 2018

@kiview this PR is not about LogMessageWaitStrategy... like... at all :)

LogMessageWaitStrategy's issue seems to be related to some race conditions

@kiview
Copy link
Member

kiview commented Jan 11, 2018

Yes I know, I was referring to the discussion in #479 (comment), maybe I mixed this up 😉

Copy link
Contributor Author

@jochenhebbrecht jochenhebbrecht left a comment

Choose a reason for hiding this comment

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

Hi @bsideup. I updated the code related to your remarks. Can you approve/comment the new commits? Jochen

CHANGELOG.md Outdated
@@ -6,6 +6,7 @@ All notable changes to this project will be documented in this file.
### Fixed
- Fixed problem with case-sensitivity when checking internal port. ([\#524](https://github.com/testcontainers/testcontainers-java/pull/524))
- Add retry logic around checkExposedPort pre-flight check for improved robustness ([\#513](https://github.com/testcontainers/testcontainers-java/issues/513))
- Fixed retrieval of Docker host IP when running inside Docker. ([\#479](https://github.com/testcontainers/testcontainers-java/issues/479))
Copy link
Member

Choose a reason for hiding this comment

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

This should go to the "upcoming" section, I will create one :)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Urgh ... sorry, my mistake. Sorry, was doing things too fast. Thanks for taking this one on you.

@bsideup bsideup merged commit fcb4481 into testcontainers:master Jan 12, 2018
@bsideup
Copy link
Member

bsideup commented Jan 12, 2018

@jochenhebbrecht merged, thanks! 👍 💪

@jochenhebbrecht jochenhebbrecht deleted the hotfix/docker-host-ip-not-retrieved-when-in-docker-container branch January 12, 2018 09:41
@bsideup bsideup added this to the 1.6.0 milestone Jan 27, 2018
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants