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

[cli] Adds a check for linuxkit in addition to moby kernel #7326

Merged
merged 1 commit into from
Nov 14, 2017

Conversation

benoitf
Copy link
Contributor

@benoitf benoitf commented Nov 13, 2017

chery-pick of che6 #7292

What does this PR do?

add linuxkit support for kernels used when running docker4mac or docker4windows (else it will flag it as being 'native')

The change has been introduced with latest versions of Docker

What issues does this PR fix or reference?

#7282

Release Notes

Latest Docker versions for Mac and Windows are using LinuxKit kernels instead of moby kernels. It was used to detect if docker was being native or inside a vm (Mac/Windows). Now it is supporting both moby and linuxkit kernels.

Docs PR

N/A

Change-Id: Id71fed460ae55ff6a1a5c34b6771f898872c91b1
Signed-off-by: Florent BENOIT fbenoit@redhat.com

…ing docker4mac or docker4windows (else it will flag it as being 'native')

The change has been introduced with latest versions of Docker
issue is #7282

Change-Id: Id71fed460ae55ff6a1a5c34b6771f898872c91b1
Signed-off-by: Florent BENOIT <fbenoit@redhat.com>
@benoitf benoitf requested review from skabashnyuk, riuvshin and a user November 13, 2017 09:48
@benoitf benoitf self-assigned this Nov 13, 2017
@benoitf benoitf added status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. kind/bug Outline of a bug - must adhere to the bug report template. labels Nov 13, 2017
@benoitf benoitf merged commit 1556517 into master Nov 14, 2017
@benoitf benoitf added this to the 5.21.0 milestone Nov 14, 2017
@benoitf benoitf removed the status/code-review This issue has a pull request posted for it and is awaiting code review completion by the community. label Nov 14, 2017
@benoitf benoitf deleted the fix-docker4mac-new-docker branch November 14, 2017 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
kind/bug Outline of a bug - must adhere to the bug report template.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants