Make MockServer compatible with newer (5.11.x) versions#3437
Merged
bsideup merged 8 commits intotestcontainers:masterfrom Dec 11, 2020
Merged
Make MockServer compatible with newer (5.11.x) versions#3437bsideup merged 8 commits intotestcontainers:masterfrom
bsideup merged 8 commits intotestcontainers:masterfrom
Conversation
fixes testcontainers#2984, testcontainers#2710 in mock-server/mockserver@9f27af0 mockserver introduced a GET http healthcheck (what was released in 5.9.0) and since 5.11.0 uses distroless image, with the default wait strategy, we hit into testcontainers#3317 As the 5.11.0+ is actually a smaller image, more secure and 5.9.0 was released almost a year ago (which means users with 5.9.0+ versions would be able to update testcontainers without changes), I think worth bumping the base version. For the users on old versions the old behaviour could be set with the default waiting strategy back `.waitingFor(Wait.defaultWaitStrategy())`. This PR also brings two small changes to be complete - mockserver official image now is `mockserver/mockserver` (but I added previous as a compatible). And added small note to the docs regarding matched version of a client, as anyway had to change docs after test adjustments (wasn't able to test properly with rule in the same class as old version).
lanwen
changed the title
lanwen
changed the title
Contributor
Author
|
with #3533 we can support old images as well, will update the PR |
lanwen
changed the title
Contributor
Author
|
@bsideup I updated the PR as well as the PR description |
bsideup
approved these changes
Dec 11, 2020
bsideup
changed the title
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
2 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
fixes #2984, #2710
in mock-server/mockserver@9f27af0 mockserver introduced a GET http healthcheck (what was released in 5.9.0) and since 5.11.0 uses distroless image, because of what with the default wait strategy, we hit into #3317
As the 5.11.0+ is actually a smaller image, more secure lots of people should definitely update. However old versions should be supported as well and thanks to #3533 its possible now to use a PUT request to check liveness.
In the test I also explicitly use 5.9.0+ status env variable to emphasize the ping endpoint works fine
This PR also brings two small changes to be complete - mockserver official image now is
mockserver/mockserver(I added it as a compatible).And added a small note to the docs regarding matched version of a client, as anyway had to change docs after test adjustments (wasn't able to test properly with rule in the same class a new version with an old version at the same time).