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.

Sign up for GitHub

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

Jump to bottom

Suppress docker-on-mac message unless it's a single container deployment #28821

Merged
merged 5 commits into from Dec 14, 2021
Merged

Suppress docker-on-mac message unless it's a single container deployment #28821

merged 5 commits into from Dec 14, 2021

Conversation

kevinwojo
Copy link
Contributor

@kevinwojo kevinwojo commented Dec 9, 2021 •
edited

Addresses this issue: #28405

@cla-bot cla-bot bot added the cla-signed label Dec 9, 2021
@kevinwojo
Copy link
Contributor Author

Doing some research on how to fingerprint host environment.

@kevinwojo kevinwojo marked this pull request as ready for review December 10, 2021 20:34
@kevinwojo
Copy link
Contributor Author

There doesn't appear to be a lot we can do besides detect the hostname docker.internal from within the container.
See: https://stackoverflow.com/questions/22944631/how-to-get-the-ip-address-of-the-docker-host-from-inside-a-docker-container

@kevinwojo
Copy link
Contributor Author

Using the sourcegraph/server image on my macbook pro:

Screen Shot 2021-12-10 at 4 00 18 PM

From my linux workstation:
Screen Shot 2021-12-10 at 4 00 10 PM

valerybugakov
valerybugakov approved these changes Dec 14, 2021
View reviewed changes
Copy link
Member

@valerybugakov valerybugakov left a comment

Choose a reason for hiding this comment

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

✅

@kevinwojo kevinwojo merged commit 9576665 into main Dec 14, 2021
@kevinwojo kevinwojo deleted the kcw/squash-docker-on-mac branch December 14, 2021 14:04
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@valerybugakov valerybugakov valerybugakov approved these changes

Assignees
No one assigned
Labels
cla-signed
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
2 participants
@kevinwojo @valerybugakov