mirror of
https://github.com/moby/moby.git
synced 2022-11-09 12:21:53 -05:00
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 4e3ab9e9fb
)
Signed-off-by: Sebastiaan van Stijn <github@gone.nl>
This commit is contained in:
parent
a070874828
commit
4aaf3ead97
1 changed files with 3 additions and 3 deletions
|
@ -30,7 +30,7 @@ ARG GO_VERSION=1.12.17
|
|||
ARG DEBIAN_FRONTEND=noninteractive
|
||||
ARG VPNKIT_DIGEST=e508a17cfacc8fd39261d5b4e397df2b953690da577e2c987a47630cd0c42f8e
|
||||
|
||||
FROM golang:${GO_VERSION}-stretch AS base
|
||||
FROM golang:${GO_VERSION}-buster AS base
|
||||
ARG APT_MIRROR
|
||||
RUN sed -ri "s/(httpredir|deb).debian.org/${APT_MIRROR:-deb.debian.org}/g" /etc/apt/sources.list \
|
||||
&& 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
|
|||
ARG DEBIAN_FRONTEND
|
||||
ARG CONTAINERD_COMMIT
|
||||
RUN apt-get update && apt-get install -y --no-install-recommends \
|
||||
btrfs-tools \
|
||||
libbtrfs-dev \
|
||||
&& rm -rf /var/lib/apt/lists/*
|
||||
ENV INSTALL_BINARY_NAME=containerd
|
||||
COPY hack/dockerfile/install/install.sh ./install.sh
|
||||
|
@ -256,7 +256,7 @@ RUN apt-get update && apt-get install -y --no-install-recommends \
|
|||
aufs-tools \
|
||||
bash-completion \
|
||||
binutils-mingw-w64 \
|
||||
btrfs-tools \
|
||||
libbtrfs-dev \
|
||||
bzip2 \
|
||||
g++-mingw-w64-x86-64 \
|
||||
iptables \
|
||||
|
|
Loading…
Reference in a new issue