Browse code

Dockerfile: switch golang image to "buster" variant, and update btrfs packages

The btrfs-tools was a transitional package, and no longer exists:

> Package btrfs-tools
> stretch (oldstable) (admin): transitional dummy package
> 4.7.3-1: amd64 arm64 armel armhf i386 mips mips64el mipsel ppc64el s390x

It must be replaced either by `btrfs-progs` or `libbtrfs-dev` (which has just the development headers)

> Package: libbtrfs-dev (4.20.1-2)
> Checksumming Copy on Write Filesystem utilities (development headers)

Note that the `libbtrfs-dev` package is not available on Debian stretch
(only in stretch-backports)

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/07/17 21:37:56
Showing 1 changed files
... ...
@@ -6,7 +6,7 @@ ARG DEBIAN_FRONTEND=noninteractive
6 6
 ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
7 7
 ARG DOCKER_BUILDTAGS="apparmor seccomp selinux"
8 8
 
9
-FROM golang:${GO_VERSION}-stretch AS base
9
+FROM golang:${GO_VERSION}-buster AS base
10 10
 RUN echo 'Binary::apt::APT::Keep-Downloaded-Packages "true";' > /etc/apt/apt.conf.d/keep-cache
11 11
 ARG APT_MIRROR
12 12
 RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
... ...
@@ -113,9 +113,9 @@ RUN --mount=type=cache,sharing=locked,id=moby-cross-false-aptlib,target=/var/lib
113 113
     --mount=type=cache,sharing=locked,id=moby-cross-false-aptcache,target=/var/cache/apt \
114 114
         apt-get update && apt-get install -y --no-install-recommends \
115 115
             binutils-mingw-w64 \
116
-            btrfs-tools \
117 116
             g++-mingw-w64-x86-64 \
118 117
             libapparmor-dev \
118
+            libbtrfs-dev \
119 119
             libdevmapper-dev \
120 120
             libseccomp-dev \
121 121
             libsystemd-dev \
... ...
@@ -163,7 +163,7 @@ ARG CONTAINERD_COMMIT
163 163
 RUN --mount=type=cache,sharing=locked,id=moby-containerd-aptlib,target=/var/lib/apt \
164 164
     --mount=type=cache,sharing=locked,id=moby-containerd-aptcache,target=/var/cache/apt \
165 165
         apt-get update && apt-get install -y --no-install-recommends \
166
-            btrfs-tools
166
+            libbtrfs-dev
167 167
 ENV INSTALL_BINARY_NAME=containerd
168 168
 COPY hack/dockerfile/install/install.sh ./install.sh
169 169
 COPY hack/dockerfile/install/$INSTALL_BINARY_NAME.installer ./