Skip to content

Vendor containers/storage#179

Merged
runcom merged 2 commits intocontainers:masterfrom
nalind:vendor-storage
Dec 15, 2016
Merged

Vendor containers/storage#179
runcom merged 2 commits intocontainers:masterfrom
nalind:vendor-storage

Conversation

@nalind
Copy link
Member

@nalind nalind commented Aug 31, 2016

Vendor containers/storage, and its dependencies github.com/mistifyio/go-zfs and github.com/pborman/uuid.

@mtrmac
Copy link
Contributor

mtrmac commented Aug 31, 2016

I guess it would be cleanest to have a single PR which vendors this as one commit, and then the appropriate version of containers/image as another commit. In the meantime, is there a benefit? Am I right in guessing that it would allow the containers/image#63 tests to pass?

@nalind
Copy link
Member Author

nalind commented Aug 31, 2016

This should fix most of the problem that's keeping the test for containers/image#63 from passing, but I think it still needs to conditionally define the btrfs_noversion and libdm_no_deferred_remove build tags.

@nalind nalind force-pushed the vendor-storage branch 9 times, most recently from e38c195 to 2618f32 Compare September 8, 2016 14:14
@nalind nalind force-pushed the vendor-storage branch 4 times, most recently from 8b17e31 to 3accac6 Compare September 13, 2016 16:24
@nalind nalind force-pushed the vendor-storage branch 2 times, most recently from 19f11a4 to e8782d9 Compare September 19, 2016 20:58
@nalind nalind force-pushed the vendor-storage branch 3 times, most recently from c354855 to a55ff1e Compare October 27, 2016 15:45
@rhatdan
Copy link
Member

rhatdan commented Oct 28, 2016

Is this still being worked on?

@nalind
Copy link
Member Author

nalind commented Oct 28, 2016

@rhatdan Yes, the PR is current.

@rhatdan
Copy link
Member

rhatdan commented Oct 28, 2016

@mtrmac @runcom PTAL

@runcom
Copy link
Member

runcom commented Oct 28, 2016

@rhatdan we need to first merge containers/image#63 and that's pending review by Miloslav

@rhatdan
Copy link
Member

rhatdan commented Oct 28, 2016

Ok we just need him to make sure nothing in Signatures gets broken.

@nalind nalind force-pushed the vendor-storage branch 2 times, most recently from f6fd42f to 1182a23 Compare November 1, 2016 14:47
@nalind nalind force-pushed the vendor-storage branch 2 times, most recently from 40ca40c to 3141455 Compare December 8, 2016 19:05
When we start up, initialize handlers so that we can import blobs
correctly when using the storage library.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@nalind nalind force-pushed the vendor-storage branch 2 times, most recently from 14a8e51 to a9b2917 Compare December 15, 2016 16:52
Vendor containers/storage, and its dependencies github.com/pborman/uuid
and github.com/mistifyio/go-zfs, which we didn't already use.

Update the build Dockerfile to install their dependencies.

Add scriptlets that try to detect whether or not we need to use the
"libdm_no_deferred_remove" and/or "btrfs_noversion" build tags.

Signed-off-by: Nalin Dahyabhai <[email protected]>
@nalind
Copy link
Member Author

nalind commented Dec 15, 2016

Updated to pull in the current version of containers/image as well.

@runcom runcom merged commit d830304 into containers:master Dec 15, 2016
@nalind nalind deleted the vendor-storage branch June 27, 2017 21:12
@github-actions github-actions bot locked as resolved and limited conversation to collaborators Oct 9, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

4 participants