Merge pull request #3997 from thaJeztah/1.2_backport_dockerfile_test_fixes

estesp · web-flow · commit 9c7bd5072d63 · 2020-01-31T22:21:52.000Z
[release/1.2 backport] Fix btrfs packages in contrib Dockerfile
diff --git a/BUILDING.md b/BUILDING.md
@@ -135,7 +135,7 @@ You can build an image from this `Dockerfile`:
 FROM golang
 
 RUN apt-get update && \
-    apt-get install -y btrfs-tools libseccomp-dev
+    apt-get install -y libbtrfs-dev libseccomp-dev
 ```
 
 Let's suppose that you built an image called `containerd/build`. From the
diff --git a/contrib/Dockerfile.test b/contrib/Dockerfile.test
@@ -38,7 +38,8 @@ RUN ./install-runc
 
 FROM golang-base AS dev
 RUN apt-get update && apt-get install -y \
-    btrfs-tools \
+    libbtrfs-dev \
+    btrfs-progs \
     gcc \
     git \
     libseccomp-dev \
