feat: Tini Init system

feat: Tini Init system
This commit is contained in:
Kroese 2023-10-09 20:20:28 +02:00 committed by GitHub
commit d4518040ea
2 changed files with 5 additions and 7 deletions

View file

@ -6,6 +6,7 @@ ARG DEBIAN_FRONTEND noninteractive
RUN apt-get update && apt-get -y upgrade && \ RUN apt-get update && apt-get -y upgrade && \
apt-get --no-install-recommends -y install \ apt-get --no-install-recommends -y install \
wget \ wget \
tini \
procps \ procps \
iptables \ iptables \
iproute2 \ 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.source=https://github.com/qemu-tools/qemu-docker/
LABEL org.opencontainers.image.url=https://hub.docker.com/r/qemux/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"]

View file

@ -4,7 +4,7 @@ set -Eeuo pipefail
# Docker environment variables # Docker environment variables
: ${BOOT:=''} # URL of the ISO file : ${BOOT:=''} # URL of the ISO file
: ${DEBUG:='N'} # Enable debug mode : ${DEBUG:='N'} # Enable debugging mode
: ${ALLOCATE:='Y'} # Preallocate diskspace : ${ALLOCATE:='Y'} # Preallocate diskspace
: ${ARGUMENTS:=''} # Extra QEMU parameters : ${ARGUMENTS:=''} # Extra QEMU parameters
: ${CPU_CORES:='1'} # Amount of CPU cores : ${CPU_CORES:='1'} # Amount of CPU cores
@ -32,11 +32,8 @@ if [ ! -f "$STORAGE/boot.img" ]; then
. /run/install.sh . /run/install.sh
fi fi
# Initialize disks . /run/disk.sh # Initialize disks
. /run/disk.sh . /run/network.sh # Initialize network
# Initialize network
. /run/network.sh
KVM_ERR="" KVM_ERR=""
KVM_OPTS="" KVM_OPTS=""