rancher/os
1
0
Fork 1
mirror of https://github.com/rancher/os.git synced 2025-08-09 18:48:05 +00:00
Code Issues Releases Wiki Activity

Merge pull request #1971 from SvenDowideit/fix-for-docker-17-06

Browse Source 
update to new kexec, and fix building with 17.06.1
This commit is contained in:
Sven Dowideit 2017-07-07 08:56:45 +10:00 committed by GitHub
commit 1f045bc696
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
scripts/installer/kexec/Dockerfile.dapper
View File

@ -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 \ && 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 \ zlib1g-dev uuid-dev libattr1-dev libblkid-dev libselinux-dev libudev-dev libdevmapper-dev \
module-init-tools \ module-init-tools \
parted lsscsi ksh curl git parted lsscsi ksh curl git wget
WORKDIR /source 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/ # https://www.kernel.org/pub/linux/utils/kernel/kexec/
ENV VERSION 2.0.14 ENV VERSION 2.0.15
ADD https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-$VERSION.tar.gz . 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 - \ RUN zcat kexec-tools-$VERSION.tar.gz | tar xvf - \
&& cd kexec-tools-$VERSION \ && cd kexec-tools-$VERSION \