crichardson/docker-xubuntu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Switch from tini to catatonit

Browse Source
This commit is contained in:
Héctor Molinero Fernández
2022-08-19 15:00:22 +02:00
parent 6771e41d35
commit 614643dd01
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Dockerfile.m4
View File

@@ -253,7 +253,7 @@ RUN make -j"$(nproc)"
RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=9:999 --pkgrelease=0 RUN checkinstall --default --pkgname=xrdp-pulseaudio --pkgversion=9:999 --pkgrelease=0
################################################## ##################################################
## "xubuntu" stage ## "main" stage
################################################## ##################################################
m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:22.04]], [[FROM docker.io/ubuntu:22.04]]) AS main m4_ifdef([[CROSS_ARCH]], [[FROM docker.io/CROSS_ARCH/ubuntu:22.04]], [[FROM docker.io/ubuntu:22.04]]) AS main
@@ -268,6 +268,7 @@ m4_ifelse(ENABLE_32BIT_SUPPORT, 1, [[m4_dnl
&& apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \ && apt-get install -y --no-install-recommends -o APT::Immediate-Configure=0 \
at-spi2-core \ at-spi2-core \
ca-certificates \ ca-certificates \
catatonit \
dbus \ dbus \
dbus-x11 \ dbus-x11 \
libbz2-1.0 \ libbz2-1.0 \
@@ -314,7 +315,6 @@ m4_ifelse(ENABLE_32BIT_SUPPORT, 1, [[m4_dnl
policykit-1 \ policykit-1 \
pulseaudio \ pulseaudio \
runit \ runit \
tini \
tzdata \ tzdata \
udev \ udev \
xauth \ xauth \

2
scripts/bin/container-init
View File

@@ -126,4 +126,4 @@ openssl x509 -in "${XRDP_TLS_CRT_PATH:?}" -noout -fingerprint -sha256
env | grep -Ev '^(PWD|OLDPWD|HOME|USER|SHELL|TERM|([^=]*(PASSWORD|SECRET)[^=]*))=' | sort > /etc/environment env | grep -Ev '^(PWD|OLDPWD|HOME|USER|SHELL|TERM|([^=]*(PASSWORD|SECRET)[^=]*))=' | sort > /etc/environment
# Start runit # Start runit
exec tini -- runsvdir -P /etc/service/ exec catatonit -- runsvdir -P /etc/service/