feat: Tini Init system (d4518040) · Commits · git-mirror / Qemu

Dockerfile

+2 −1

Original line number	Diff line number	Diff line
		@@ -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"]

+3 −6

Original line number	Diff line number	Diff line
		@@ -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=""