Skip to content

mountinfo: support darwin build#85

Merged
kolyshkin merged 1 commit intomoby:masterfrom
ukontainer:add-darwin
Oct 22, 2021
Merged

mountinfo: support darwin build#85
kolyshkin merged 1 commit intomoby:masterfrom
ukontainer:add-darwin

Conversation

@thehajime
Copy link
Copy Markdown
Contributor

@thehajime thehajime commented Oct 9, 2021 •
edited
Loading

This PR allows us to use mountinfo by darwin programs, which is used in this PR (via mount.Lookup() of containerd).

containerd/containerd#5935

@thehajime
mountinfo: support darwin build
9f68ee9 
Signed-off-by: Hajime Tazaki <[email protected]>
@thehajime
Copy link
Copy Markdown
Contributor Author

thehajime commented Oct 11, 2021

I added one more fix to do tests on darwin.

diff --git a/mountinfo/mountinfo_test.go b/mountinfo/mountinfo_test.go
index a584bbf..aec4356 100644
--- a/mountinfo/mountinfo_test.go
+++ b/mountinfo/mountinfo_test.go
@@ -1,4 +1,4 @@
-// +build !windows,!darwin
+// +build !windows
 
 package mountinfo

kolyshkin
kolyshkin approved these changes Oct 12, 2021
View reviewed changes
Copy link
Copy Markdown
Collaborator

@kolyshkin kolyshkin left a comment

Choose a reason for hiding this comment

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

LGTM assuming CI is 🍏

@kolyshkin kolyshkin merged commit 95edfa9 into moby:master Oct 22, 2021
@thehajime thehajime deleted the add-darwin branch October 22, 2021 22:30
@thehajime thehajime mentioned this pull request Oct 22, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@kzys kzys kzys approved these changes

@kolyshkin kolyshkin kolyshkin approved these changes

@AkihiroSuda AkihiroSuda AkihiroSuda approved these changes

Assignees

No one assigned

Labels

None yet

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@thehajime @kzys @kolyshkin @AkihiroSuda