Browse code
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 <github@gone.nl>
Sebastiaan van Stijn authored on 2017/05/15 20:22:52Showing 1 changed files
| ... | ... |
@@ -29,11 +29,6 @@ FROM debian:jessie |
| 29 | 29 |
ARG APT_MIRROR=deb.debian.org |
| 30 | 30 |
RUN sed -ri "s/(httpredir|deb).debian.org/$APT_MIRROR/g" /etc/apt/sources.list |
| 31 | 31 |
|
| 32 |
-# Add zfs ppa |
|
| 33 |
-COPY keys/launchpad-ppa-zfs.asc /go/src/github.com/docker/docker/keys/ |
|
| 34 |
-RUN apt-key add /go/src/github.com/docker/docker/keys/launchpad-ppa-zfs.asc |
|
| 35 |
-RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list |
|
| 36 |
- |
|
| 37 | 32 |
# Packaged dependencies |
| 38 | 33 |
RUN apt-get update && apt-get install -y \ |
| 39 | 34 |
apparmor \ |
| ... | ... |
@@ -63,7 +58,6 @@ RUN apt-get update && apt-get install -y \ |
| 63 | 63 |
libprotobuf-dev \ |
| 64 | 64 |
libsystemd-journal-dev \ |
| 65 | 65 |
libtool \ |
| 66 |
- libzfs-dev \ |
|
| 67 | 66 |
mercurial \ |
| 68 | 67 |
net-tools \ |
| 69 | 68 |
pkg-config \ |
| ... | ... |
@@ -74,7 +68,6 @@ RUN apt-get update && apt-get install -y \ |
| 74 | 74 |
python-pip \ |
| 75 | 75 |
python-websocket \ |
| 76 | 76 |
tar \ |
| 77 |
- ubuntu-zfs \ |
|
| 78 | 77 |
vim \ |
| 79 | 78 |
vim-common \ |
| 80 | 79 |
xfsprogs \ |