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

fix: revert removal of Colima host.docker.internal setting #6031

Merged
merged 6 commits into from Mar 29, 2024

Conversation

rfay
Copy link
Member

@rfay rfay commented Mar 29, 2024

The Issue

We're having a bit of trouble with NFS in colima/lima tb-macos-arm64-5/6/7, I'm not sure why. But we don't need to be testing NFS on macOS anyway, certainly not on orbstack/lima/colima.

Lima provides 192.168.5.2 as host.docker.internal, but colima does not seem to have it any more. I assume colima lost it in a recent Lima upgrade.

This probably means that Xdebug is not working on colima since #5994 , but I don't know why it wouldn't have been caught by automated tests.

How This PR Solves The Issue

Revert #5994 to put explicit host.docker.internal back in there again

Manual Testing Instructions

ddev debug nfsmount using colima

@rfay
Copy link
Member Author

rfay commented Mar 29, 2024

I'm probably chasing the wrong problem here, have to look closer.

Details: error=failed to StartContainer: Error response from daemon: error while mounting volume '/var/lib/docker/volumes/testnfsmount/_data': error resolving passed in network volume address: lookup host.docker.internal on 127.0.0.53:53: no such host

https://buildkite.com/ddev/macos-colima-vz/builds/380#018e86b2-655e-4ed5-b24e-5bf8be98d32c

Co-authored-by: Stanislav Zhuk <stasadev@gmail.com>
@stasadev
Copy link
Member

@rfay
Copy link
Member Author

rfay commented Mar 29, 2024

Yes, that's what it is. I tested and colima is not resolving host.docker.internal any more even though lima is.

@rfay rfay changed the title test: We don't need to check for NFS on mac [skip ci] fix: revert removal of Colima host.docker.internal setting Mar 29, 2024
@stasadev
Copy link
Member

Yes, that's what it is. I tested and colima is not resolving host.docker.internal any more even though lima is.

Is this just a partial revert for NFS or is the Colima check needed again in GetHostDockerInternalIP() ?

@rfay
Copy link
Member Author

rfay commented Mar 29, 2024

Both, I messed up the reversion

@rfay
Copy link
Member Author

rfay commented Mar 29, 2024

Here's the reason we didn't catch this in automated tests

func TestDdevXdebugEnabled(t *testing.T) {
if (dockerutil.IsColima() || dockerutil.IsLima()) && os.Getenv("DDEV_TEST_COLIMA_ANYWAY") != "true" {
t.Skip("Skipping on Lima/Colima because this test doesn't work although manual testing works")
}
if nodeps.IsWSL2() && dockerutil.IsDockerDesktop() {
t.Skip("Skipping on WSL2/Docker Desktop because this test doesn't work although manual testing works")
}

@rfay
Copy link
Member Author

rfay commented Mar 29, 2024

Oh I see, we're running the check using brew-installed DDEV v1.23.0-alpha1, which has this bug.

@rfay rfay marked this pull request as ready for review March 29, 2024 23:26
@rfay rfay requested a review from a team as a code owner March 29, 2024 23:26
@rfay rfay merged commit 9cf87a8 into ddev:master Mar 29, 2024
22 checks passed
@rfay rfay deleted the 20240328_stop_nfs_buildite branch March 29, 2024 23:28
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

2 participants