mirror of
https://github.com/AlbrechtL/openwrt-docker.git
synced 2026-10-15 08:01:26 +00:00
feat: Tini Init system
feat: Tini Init system
This commit is contained in:
+2
-1
@@ -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
@@ -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=""
|
||||
|
||||
Reference in New Issue
Block a user