[release/1.2 backport] Fix btrfs packages in contrib Dockerfile#3997
Merged
estesp merged 2 commits intocontainerd:release/1.2from Jan 31, 2020
Merged
Conversation
btrfs/ioctl.h is now included in libbtrfs-dev instead of btrfs-tools. Update BUILDING.md Dockerfile to install the correct dependency. Resolves: containerd#3813 Signed-off-by: Reid Li <[email protected]> (cherry picked from commit a647407) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Signed-off-by: Phil Estes <[email protected]> (cherry picked from commit fda652b) Signed-off-by: Sebastiaan van Stijn <[email protected]>
Codecov Report
@@ Coverage Diff @@
## release/1.2 #3997 +/- ##
============================================
Coverage 44.19% 44.19%
============================================
Files 100 100
Lines 10847 10847
============================================
Hits 4794 4794
Misses 5313 5313
Partials 740 740
Continue to review full report at Codecov.
|
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
Building containerd inside a container showed that the Dockerfile was broken (due to the
golang:1.12.ximage now using Debian Buster as base image)Nothing critical, but let's make the Dockerfile work again. Backports of: