From 46248afb01a3b86bdebc7072e778e95d6090e862 Mon Sep 17 00:00:00 2001 From: Eli Uriegas Date: Fri, 1 Jun 2018 20:31:49 +0000 Subject: [PATCH] Remove btrfs-progs in favor of libbtrfs-dev `btrfs-progs` doesn't actually contain the files we need, since we only need the headers for btrfs, which `libbtrfs-dev` now provides. Signed-off-by: Eli Uriegas Upstream-commit: 73678285d0671e1b67ec30d21e99cfe1580159fa Component: packaging --- components/packaging/deb/debian-buster/Dockerfile.aarch64 | 2 +- components/packaging/deb/debian-buster/Dockerfile.armv7l | 2 +- components/packaging/deb/debian-buster/Dockerfile.x86_64 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/components/packaging/deb/debian-buster/Dockerfile.aarch64 b/components/packaging/deb/debian-buster/Dockerfile.aarch64 index 7437c90d71..08a3293e31 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.aarch64 +++ b/components/packaging/deb/debian-buster/Dockerfile.aarch64 @@ -4,7 +4,7 @@ FROM debian:buster ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-progs build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion libbtrfs-dev build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev gnupg dirmngr --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-arm64.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/deb/debian-buster/Dockerfile.armv7l b/components/packaging/deb/debian-buster/Dockerfile.armv7l index a6b2efc1bf..ba22d4068c 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.armv7l +++ b/components/packaging/deb/debian-buster/Dockerfile.armv7l @@ -4,7 +4,7 @@ FROM arm32v7/debian:buster ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-progs build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion libbtrfs-dev build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-armv6l.tar.gz" | tar xzC /usr/local diff --git a/components/packaging/deb/debian-buster/Dockerfile.x86_64 b/components/packaging/deb/debian-buster/Dockerfile.x86_64 index 34a6a11247..26aaad9c24 100644 --- a/components/packaging/deb/debian-buster/Dockerfile.x86_64 +++ b/components/packaging/deb/debian-buster/Dockerfile.x86_64 @@ -4,7 +4,7 @@ FROM debian:buster ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -RUN apt-get update && apt-get install -y apparmor bash-completion btrfs-progs build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* +RUN apt-get update && apt-get install -y apparmor bash-completion libbtrfs-dev build-essential cmake curl ca-certificates debhelper dh-apparmor dh-systemd git libapparmor-dev libdevmapper-dev libltdl-dev libseccomp-dev pkg-config vim-common libsystemd-dev --no-install-recommends && rm -rf /var/lib/apt/lists/* ARG GO_VERSION RUN curl -fSL "https://golang.org/dl/go${GO_VERSION}.linux-amd64.tar.gz" | tar xzC /usr/local