Skip to content
This repository was archived by the owner on Oct 13, 2023. It is now read-only.

Commit 3b64f62

Browse files
committed
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> (cherry picked from commit 4e3ab9e9fbca682f75eb350c8ad4312282869a03) Signed-off-by: Sebastiaan van Stijn <github@gone.nl> Upstream-commit: 4aaf3ead970ae1fc93e63c7fc69e1b11942cdd8c Component: engine
1 parent 0c59990 commit 3b64f62

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

components/engine/Dockerfile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ARG GO_VERSION=1.12.17
3030
ARG DEBIAN_FRONTEND=noninteractive
3131
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
3232

33-
FROM golang:${GO_VERSION}-stretch AS base
33+
FROM golang:${GO_VERSION}-buster AS base
3434
ARG APT_MIRROR
3535
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
3636
&& sed -ri "s/(security).debian.org/${APT_MIRROR:-security.debian.org}/g" /etc/apt/sources.list
@@ -173,7 +173,7 @@ FROM dev-base AS containerd
173173
ARG DEBIAN_FRONTEND
174174
ARG CONTAINERD_COMMIT
175175
RUN apt-get update && apt-get install -y --no-install-recommends \
176-
btrfs-tools \
176+
libbtrfs-dev \
177177
&& rm -rf /var/lib/apt/lists/*
178178
ENV INSTALL_BINARY_NAME=containerd
179179
COPY hack/dockerfile/install/install.sh ./install.sh
@@ -256,7 +256,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
256256
aufs-tools \
257257
bash-completion \
258258
binutils-mingw-w64 \
259-
btrfs-tools \
259+
libbtrfs-dev \
260260
bzip2 \
261261
g++-mingw-w64-x86-64 \
262262
iptables \

0 commit comments

Comments
 (0)