From aafc7ae46e8ef43e83224e6b8527a63751814cd7 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 20:13:16 +0200 Subject: [PATCH 1/2] feat: Tini Init system --- Dockerfile | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 7d07fc3..26770cf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -6,6 +6,7 @@ ARG DEBIAN_FRONTEND noninteractive RUN apt-get update && apt-get -y upgrade && \ apt-get --no-install-recommends -y install \ wget \ + tini \ procps \ iptables \ iproute2 \ @@ -40,4 +41,4 @@ LABEL org.opencontainers.image.version=${VERSION_ARG} LABEL org.opencontainers.image.source=https://github.com/qemu-tools/qemu-docker/ LABEL org.opencontainers.image.url=https://hub.docker.com/r/qemux/qemu-docker/ -ENTRYPOINT ["/run/run.sh"] +ENTRYPOINT ["/usr/bin/tini", "-s", "/run/run.sh"] From 9099f4e7b7ed721ff267b1653776eacc7e755526 Mon Sep 17 00:00:00 2001 From: Kroese Date: Mon, 9 Oct 2023 20:18:21 +0200 Subject: [PATCH 2/2] style: Indentation --- run/run.sh | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/run/run.sh b/run/run.sh index 2d27e14..704492d 100755 --- a/run/run.sh +++ b/run/run.sh @@ -4,7 +4,7 @@ set -Eeuo pipefail # Docker environment variables : ${BOOT:=''} # URL of the ISO file -: ${DEBUG:='N'} # Enable debug mode +: ${DEBUG:='N'} # Enable debugging mode : ${ALLOCATE:='Y'} # Preallocate diskspace : ${ARGUMENTS:=''} # Extra QEMU parameters : ${CPU_CORES:='1'} # Amount of CPU cores @@ -32,11 +32,8 @@ if [ ! -f "$STORAGE/boot.img" ]; then . /run/install.sh fi -# Initialize disks -. /run/disk.sh - -# Initialize network -. /run/network.sh +. /run/disk.sh # Initialize disks +. /run/network.sh # Initialize network KVM_ERR="" KVM_OPTS=""