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

Support for Linux on WSL #304

Merged
merged 3 commits into from
Jul 19, 2021
Merged

Support for Linux on WSL #304

merged 3 commits into from
Jul 19, 2021

Conversation

roborourke
Copy link
Contributor

Linux on WSL can still use the host.docker.internal host name to resolve the Docker VM, so we need to account for that too when switching between the Docker Engine IP used in Linux vs Linux on WSL.

Linux on WSL can still use the `host.docker.internal` host name to resolve the Docker VM, so we need to account for that too when switching between the Docker Engine IP used in Linux vs Linux on WSL.
@roborourke roborourke requested a review from rmccue July 19, 2021 17:24
@roborourke roborourke merged commit e83825b into master Jul 19, 2021
@roborourke roborourke deleted the support-wsl-host branch July 19, 2021 17:39
@hm-backport
Copy link

hm-backport bot commented Jul 19, 2021

The backport to v6-branch failed:

Commits ["cb390b91a25dbe4bde466a106dc6e7ab44708f77","a3c091aac866840248a0ab58a5485a97e8823313","062e8ae8e263561618c56359a74a46fb2b15c798"] could not be cherry-picked on top of v6-branch

To backport manually, run these commands in your terminal:

# Fetch latest updates from GitHub.
git fetch
# Create new working tree.
git worktree add .worktrees/backport v6-branch
# Navigate to the new directory.
cd .worktrees/backport
# Cherry-pick all the commits of this pull request and resolve the likely conflicts.
git cherry-pick cb390b91a25dbe4bde466a106dc6e7ab44708f77 a3c091aac866840248a0ab58a5485a97e8823313 062e8ae8e263561618c56359a74a46fb2b15c798
# Create a new branch with these backported commits.
git checkout -b backport-304-to-v6-branch
# Push it to GitHub.
git push --set-upstream origin backport-304-to-v6-branch
# Go back to the original working tree.
cd ../..
# Delete the working tree.
git worktree remove .worktrees/backport

Then, create a pull request where the base branch is v6-branch and the compare/head branch is backport-304-to-v6-branch.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants