1
0
mirror of https://github.com/rancher/os.git synced 2025-09-13 05:33:34 +00:00

add a timeout in case a system-container refuses to quit

Signed-off-by: Sven Dowideit <SvenDowideit@home.org.au>
This commit is contained in:
Sven Dowideit
2017-07-28 13:27:40 +10:00
parent 3b624d7f38
commit c51921e54a
8 changed files with 73 additions and 21 deletions

View File

@@ -10,7 +10,7 @@ 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
@@ -20,8 +20,9 @@ WORKDIR /source
# && 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 \

View File

@@ -50,7 +50,8 @@
"defaults": {"$ref": "#/definitions/defaults_config"},
"resize_device": {"type": "string"},
"sysctl": {"type": "object"},
"restart_services": {"type": "array"}
"restart_services": {"type": "array"},
"shutdown_timeout": {"type": "integer"}
}
},