devbeni/yolks
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Arma 3] Fix SIGINT not getting passed to server (#212)

Browse Source 
* Add Tini to Arma 3
* add forgoten tini to Python 3.12


---------

Co-authored-by: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
This commit is contained in:
Red-Thirten
2023-12-19 00:51:19 -08:00
committed by GitHub
parent a401057a70
commit 6bb8c6fb29
3 changed files with 18 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bot/red/Dockerfile
View File

@@ -34,7 +34,7 @@ RUN apt update \
liblzma-dev \ liblzma-dev \
ffmpeg \ ffmpeg \
imagemagick \ imagemagick \
tini tini
RUN pip install --upgrade pip RUN pip install --upgrade pip
RUN pip install python-forecastio tweepy unidecode mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil RUN pip install python-forecastio tweepy unidecode mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil

14
games/arma3/Dockerfile
View File

@@ -28,7 +28,8 @@ RUN dpkg --add-architecture i386 \
libnss-wrapper \ libnss-wrapper \
libnss-wrapper:i386 \ libnss-wrapper:i386 \
libtbb2 \ libtbb2 \
libtbb2:i386 libtbb2:i386 \
tini
## Configure locale ## Configure locale
RUN update-locale lang=en_US.UTF-8 \ RUN update-locale lang=en_US.UTF-8 \
@@ -47,6 +48,11 @@ USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
## Copy over and execute entrypoint.sh ## Copy over entrypoint.sh and set permissions
COPY ./entrypoint.sh /entrypoint.sh COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
## Start with Tini to pass future stop signals correctly
STOPSIGNAL SIGINT
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

10
python/3.12/Dockerfile
View File

@@ -3,12 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.12-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io" LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \ RUN apt update \
&& apt -y install git gcc g++ ca-certificates dnsutils curl iproute2 ffmpeg procps \ && apt -y install git gcc g++ ca-certificates dnsutils curl iproute2 ffmpeg procps tini \
&& useradd -m -d /home/container container && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD [ "/bin/bash", "/entrypoint.sh" ]
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]