|
@@ -30,10 +30,6 @@ RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys E87
|
|
|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
|
|
|| apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys E871F18B51E0147C77796AC81196BA81F6B0FC61
|
|
RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
|
|
RUN echo deb http://ppa.launchpad.net/zfs-native/stable/ubuntu trusty main > /etc/apt/sources.list.d/zfs.list
|
|
|
|
|
|
-# add llvm repo
|
|
|
|
-RUN apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421 \
|
|
|
|
- || apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 6084F3CF814B57C1CF12EFD515CF4D18AF4F7421
|
|
|
|
-RUN echo deb http://llvm.org/apt/jessie/ llvm-toolchain-jessie-3.8 main > /etc/apt/sources.list.d/llvm.list
|
|
|
|
|
|
|
|
# allow replacing httpredir mirror
|
|
# allow replacing httpredir mirror
|
|
ARG APT_MIRROR=httpredir.debian.org
|
|
ARG APT_MIRROR=httpredir.debian.org
|
|
@@ -49,7 +45,7 @@ RUN apt-get update && apt-get install -y \
|
|
bsdmainutils \
|
|
bsdmainutils \
|
|
btrfs-tools \
|
|
btrfs-tools \
|
|
build-essential \
|
|
build-essential \
|
|
- clang-3.8 \
|
|
|
|
|
|
+ clang \
|
|
createrepo \
|
|
createrepo \
|
|
curl \
|
|
curl \
|
|
dpkg-sig \
|
|
dpkg-sig \
|
|
@@ -76,10 +72,7 @@ RUN apt-get update && apt-get install -y \
|
|
tar \
|
|
tar \
|
|
zip \
|
|
zip \
|
|
--no-install-recommends \
|
|
--no-install-recommends \
|
|
- && pip install awscli==1.10.15 \
|
|
|
|
- && ln -snf /usr/bin/clang-3.8 /usr/local/bin/clang \
|
|
|
|
- && ln -snf /usr/bin/clang++-3.8 /usr/local/bin/clang++
|
|
|
|
-
|
|
|
|
|
|
+ && pip install awscli==1.10.15
|
|
# Get lvm2 source for compiling statically
|
|
# Get lvm2 source for compiling statically
|
|
ENV LVM2_VERSION 2.02.103
|
|
ENV LVM2_VERSION 2.02.103
|
|
RUN mkdir -p /usr/local/lvm2 \
|
|
RUN mkdir -p /usr/local/lvm2 \
|