From b4584a616ae7cfc70f7ab62a8b5366c9f8eb9fae Mon Sep 17 00:00:00 2001 From: Sven Dowideit Date: Fri, 7 Jul 2017 08:44:03 +1000 Subject: [PATCH] update to new kexec, and fix building with 17.06.1 Signed-off-by: Sven Dowideit --- scripts/installer/kexec/Dockerfile.dapper | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) diff --git a/scripts/installer/kexec/Dockerfile.dapper b/scripts/installer/kexec/Dockerfile.dapper index 49ad5889..179ed7ab 100644 --- a/scripts/installer/kexec/Dockerfile.dapper +++ b/scripts/installer/kexec/Dockerfile.dapper @@ -10,18 +10,14 @@ RUN echo "Acquire::http { Proxy \"$APTPROXY\"; };" >> /etc/apt/apt.conf.d/01prox && apt-get install -yq build-essential autoconf libtool gawk alien fakeroot \ zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libdevmapper-dev \ module-init-tools \ - parted lsscsi ksh curl git + parted lsscsi ksh curl git wget WORKDIR /source -#ADD https://github.com/rancher/os-kernel/releases/download/v4.9.15-rancher/build-linux-4.9.15-rancher-x86.tar.gz . -#RUN mkdir -p /usr/src/v4.9.15-rancher \ -# && cd /usr/src/v4.9.15-rancher \ -# && tar zxvf /source/build-linux-4.9.15-rancher-x86.tar.gz - # https://www.kernel.org/pub/linux/utils/kernel/kexec/ -ENV VERSION 2.0.14 -ADD https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-$VERSION.tar.gz . +ENV VERSION 2.0.15 +RUN wget https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-$VERSION.tar.gz \ + && tar zxvf kexec-tools-$VERSION.tar.gz RUN zcat kexec-tools-$VERSION.tar.gz | tar xvf - \ && cd kexec-tools-$VERSION \