From 03266822c801b749adc7e9f30ce3eb20d31f5501 Mon Sep 17 00:00:00 2001 From: Sebastiaan van Stijn Date: Mon, 15 May 2017 13:22:52 +0200 Subject: [PATCH] Remove zfs from static builds The libzfs-dev package is not needed for the static builds, and only used for ubuntu packages, so removing from the Dockerfile. This resolves an issue where build fails due to the PPA having changed. Signed-off-by: Sebastiaan van Stijn Upstream-commit: 8022c5fdd12ae6dc5aac3c9e59f5524954b55730 Component: engine --- components/engine/Dockerfile | 7 ------- 1 file changed, 7 deletions(-) diff --git a/components/engine/Dockerfile b/components/engine/Dockerfile index 72076884b0..4bfd0b0580 100644 --- a/components/engine/Dockerfile +++ b/components/engine/Dockerfile @@ -29,11 +29,6 @@ FROM debian:jessie ARG APT_MIRROR=deb.debian.org RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list -# Add zfs ppa -COPY keys/launchpad-ppa-zfs.asc /go/src/github.com/docker/docker/keys/ -RUN apt-key add /go/src/github.com/docker/docker/keys/launchpad-ppa-zfs.asc -RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list - # Packaged dependencies RUN apt-get update && apt-get install -y \ apparmor \ @@ -63,7 +58,6 @@ RUN apt-get update && apt-get install -y \ libprotobuf-dev \ libsystemd-journal-dev \ libtool \ - libzfs-dev \ mercurial \ net-tools \ pkg-config \ @@ -74,7 +68,6 @@ RUN apt-get update && apt-get install -y \ python-pip \ python-websocket \ tar \ - ubuntu-zfs \ vim \ vim-common \ xfsprogs \