This repository was archived by the owner on Sep 30, 2024. It is now read-only.
[Backport 5.0] fix: remove likelyDockerOnMac functionality#50661
Merged
Conversation
## Description This function is trying to resolve DNS to `host.docker.internal` which might not work correctly on docker-compose environments, causing DNS timeouts on an air-gapped customer instance. We can do the same check on the UI itself by checking the user navigator for Mac OS X string. ## Test plan Tested locally by running sg, running in docker-compose. @indradhanush and @jac present on a zoom call where we tested it together. [main-dry-run is here](https://buildkite.com/sourcegraph/sourcegraph/builds/213164) (cherry picked from commit 83f26a3)
kopancek
approved these changes
Apr 17, 2023
keegancsmith
approved these changes
Apr 17, 2023
keegancsmith
left a comment
Member
There was a problem hiding this comment.
wow, I can't believe we had a 10s timeout on the request path to every request!! Kill with fire.
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 subscribe to this conversation on GitHub.
Already have an account?
Sign in.
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.
Description
This function is trying to resolve DNS to
host.docker.internalwhich might not work correctly on docker-compose environments, causing DNS timeouts on an air-gapped customer instance.We can do the same check on the UI itself by checking the user navigator for Mac OS X string.
Test plan
Tested locally by running sg, running in docker-compose. @indradhanush and @jac present on a zoom call where we tested it together.
main-dry-run is here
Backport 83f26a3 from #50638