From e6c1b4cc4a7f013fb28100c8ee86204cd9077018 Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Wed, 19 Jul 2023 18:01:39 +0200
Subject: [PATCH 1/8] tini part 1
---
java/11/Dockerfile | 8 +++++---
java/11j9/Dockerfile | 9 +++++----
java/16/Dockerfile | 8 +++++---
java/16j9/Dockerfile | 9 +++++----
java/17/Dockerfile | 8 +++++---
java/19/Dockerfile | 8 +++++---
java/8/Dockerfile | 8 +++++---
java/8j9/Dockerfile | 9 +++++----
nodejs/12/Dockerfile | 9 ++++++---
nodejs/14/Dockerfile | 8 +++++---
nodejs/16/Dockerfile | 8 +++++---
nodejs/17/Dockerfile | 6 ++++--
nodejs/18/Dockerfile | 8 +++++---
nodejs/19/Dockerfile | 8 +++++---
nodejs/20/Dockerfile | 8 +++++---
oses/alpine/Dockerfile | 8 +++++---
oses/debian/Dockerfile | 9 +++++----
oses/ubuntu/Dockerfile | 8 +++++---
python/2.7/Dockerfile | 8 +++++---
python/3.10/Dockerfile | 8 +++++---
python/3.11/Dockerfile | 8 +++++---
python/3.7/Dockerfile | 8 +++++---
python/3.8/Dockerfile | 8 +++++---
python/3.9/Dockerfile | 8 +++++---
steamcmd/debian/Dockerfile | 8 +++++---
steamcmd/dotnet/Dockerfile | 8 +++++---
steamcmd/ubuntu/Dockerfile | 8 +++++---
27 files changed, 135 insertions(+), 84 deletions(-)
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
index 007fca2c2..bdf4acad4 100644
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -6,12 +6,14 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
index 7c5c67592..ff57bed05 100644
--- a/java/11j9/Dockerfile
+++ b/java/11j9/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-11-jdk
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
@@ -11,6 +11,7 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-
-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"]
\ No newline at end of file
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
index 2080cf17a..827c13792 100644
--- a/java/16/Dockerfile
+++ b/java/16/Dockerfile
@@ -6,12 +6,14 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
index 9ee4c7d77..3e378439d 100644
--- a/java/16j9/Dockerfile
+++ b/java/16j9/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-16-jdk
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
@@ -11,6 +11,7 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-
-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"]
diff --git a/java/17/Dockerfile b/java/17/Dockerfile
index 3b8380b6b..cc4207f9e 100644
--- a/java/17/Dockerfile
+++ b/java/17/Dockerfile
@@ -6,12 +6,14 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/java/19/Dockerfile b/java/19/Dockerfile
index c56508071..53789ad37 100644
--- a/java/19/Dockerfile
+++ b/java/19/Dockerfile
@@ -6,12 +6,14 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
index 74c4b6f7c..a80c737e6 100644
--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -6,12 +6,14 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolk
LABEL org.opencontainers.image.licenses=MIT
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
index 9395fe8f3..99086fe10 100644
--- a/java/8j9/Dockerfile
+++ b/java/8j9/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH ibm-semeru-runtimes:open-8-jdk
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update -y \
- && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 \
+ && apt install -y curl lsof ca-certificates openssl git tar sqlite3 fontconfig tzdata iproute2 libfreetype6 tini \
&& useradd -d /home/container -m container
USER container
@@ -11,6 +11,7 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-
-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"]
diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile
index c10b4b75e..3d8482b7a 100644
--- a/nodejs/12/Dockerfile
+++ b/nodejs/12/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:12-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile
index 819b31d1e..89a177933 100644
--- a/nodejs/14/Dockerfile
+++ b/nodejs/14/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:14-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile
index e59bc4b84..67d85d378 100644
--- a/nodejs/16/Dockerfile
+++ b/nodejs/16/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:16-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile
index 08d5c0716..2cdbc7ea7 100644
--- a/nodejs/17/Dockerfile
+++ b/nodejs/17/Dockerfile
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile
index d62fcecb9..3e8b89422 100644
--- a/nodejs/18/Dockerfile
+++ b/nodejs/18/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:18-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/nodejs/19/Dockerfile b/nodejs/19/Dockerfile
index fd9a71f44..df181eeec 100644
--- a/nodejs/19/Dockerfile
+++ b/nodejs/19/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:19-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile
index ef9ea310f..916d3ad4a 100644
--- a/nodejs/20/Dockerfile
+++ b/nodejs/20/Dockerfile
@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH node:20-bullseye-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
- && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping \
+ && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping tini \
&& useradd -m -d /home/container container
RUN npm install npm@latest -g
@@ -12,5 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/oses/alpine/Dockerfile b/oses/alpine/Dockerfile
index b7badc919..633f72142 100644
--- a/oses/alpine/Dockerfile
+++ b/oses/alpine/Dockerfile
@@ -27,12 +27,14 @@ LABEL author="Matthew Penner" maintainer="matthew@pterodactyl.io"
LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT
-RUN apk add --update --no-cache ca-certificates tzdata \
+RUN apk add --update --no-cache ca-certificates tzdata tini \
&& adduser -D -h /home/container container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-CMD [ "/bin/ash", "/entrypoint.sh" ]
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/sbin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile
index 6197bc879..20f9c213a 100644
--- a/oses/debian/Dockerfile
+++ b/oses/debian/Dockerfile
@@ -20,7 +20,7 @@ RUN apt update \
## Install dependencies
RUN apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
libfontconfig libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadbclient-dev-compat libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates \
- liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4 libprotobuf23 libfluidsynth2 procps libstdc++6
+ liblua5.3-0 libz-dev rapidjson-dev tzdata libevent-dev libzip4 libprotobuf23 libfluidsynth2 procps libstdc++6 tini
## Configure locale
RUN update-locale lang=en_US.UTF-8 \
@@ -29,6 +29,7 @@ RUN update-locale lang=en_US.UTF-8 \
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/oses/ubuntu/Dockerfile b/oses/ubuntu/Dockerfile
index 985c072c9..8f82496be 100644
--- a/oses/ubuntu/Dockerfile
+++ b/oses/ubuntu/Dockerfile
@@ -15,7 +15,7 @@ RUN apt update \
RUN apt install -y gcc g++ libgcc1 libc++-dev gdb libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
libfontconfig icu-devtools libunwind8 sqlite3 libsqlite3-dev libzip4 locales ffmpeg apt-transport-https init-system-helpers \
libcurl3-gnutls liblua5.1-0 libluajit-5.1-2 libsqlite3-0 bzip2 zlib1g libevent-dev libmariadb-dev-compat libmariadb-dev libssl-dev \
- libfluidsynth-dev libmariadb-dev libicu-dev libssl3 libduktape207 libjsoncpp-dev libleveldb1d libncurses5 libncursesw5
+ libfluidsynth-dev libmariadb-dev libicu-dev libssl3 libduktape207 libjsoncpp-dev libleveldb1d libncurses5 libncursesw5 tini
## configure locale
RUN update-locale lang=en_US.UTF-8 \
@@ -23,5 +23,7 @@ RUN update-locale lang=en_US.UTF-8 \
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/python/2.7/Dockerfile b/python/2.7/Dockerfile
index bcfac0d4a..efb20028f 100644
--- a/python/2.7/Dockerfile
+++ b/python/2.7/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:2.7-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile
index 5f6d9f3de..d169043f9 100644
--- a/python/3.10/Dockerfile
+++ b/python/3.10/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.10-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/python/3.11/Dockerfile b/python/3.11/Dockerfile
index eabf1456e..6e1ea42fc 100644
--- a/python/3.11/Dockerfile
+++ b/python/3.11/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.11-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/python/3.7/Dockerfile b/python/3.7/Dockerfile
index bad33ac96..535b8b99a 100644
--- a/python/3.7/Dockerfile
+++ b/python/3.7/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.7-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile
index dae396d5f..0cda5e7eb 100644
--- a/python/3.8/Dockerfile
+++ b/python/3.8/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.8-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile
index e9843f816..d39f3cb75 100644
--- a/python/3.9/Dockerfile
+++ b/python/3.9/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH python:3.9-slim
LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
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
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/steamcmd/debian/Dockerfile b/steamcmd/debian/Dockerfile
index feec50b0c..85a8d180b 100644
--- a/steamcmd/debian/Dockerfile
+++ b/steamcmd/debian/Dockerfile
@@ -10,7 +10,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt-get update \
&& apt-get upgrade -y \
- && apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl xvfb \
+ && apt-get install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 libsdl2-2.0-0 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl xvfb tini \
&& useradd -m -d /home/container container
## install rcon
@@ -23,5 +23,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ../entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/steamcmd/dotnet/Dockerfile b/steamcmd/dotnet/Dockerfile
index be1e1a07a..977b34a5b 100644
--- a/steamcmd/dotnet/Dockerfile
+++ b/steamcmd/dotnet/Dockerfile
@@ -9,7 +9,7 @@ RUN dpkg --add-architecture i386 \
&& apt upgrade -y \
&& apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata \
&& apt install -y libstdc++6 libstdc++6:i386 libc6-amd64 libc6:i386 psmisc libgdiplus libcurl4 libfontconfig1 libpangocairo-1.0-0 libnss3 libgconf-2-4 libxi6 libxcursor1 libxss1 libxcomposite1 libasound2 libxdamage1 libxtst6 libatk1.0-0 libxrandr2 libcurl4 xvfb mesa-utils git \
- && apt install -y python3 python3-dev python3-pip apt-transport-https wget iproute2 sqlite3 xvfb \
+ && apt install -y python3 python3-dev python3-pip apt-transport-https wget iproute2 sqlite3 xvfb tini \
&& useradd -d /home/container -m container
RUN apt update -y \
@@ -30,5 +30,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/steamcmd/ubuntu/Dockerfile b/steamcmd/ubuntu/Dockerfile
index 366567ac0..332241e48 100644
--- a/steamcmd/ubuntu/Dockerfile
+++ b/steamcmd/ubuntu/Dockerfile
@@ -11,7 +11,7 @@ RUN dpkg --add-architecture i386 \
&& apt update \
&& apt upgrade -y \
&& apt -y install tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl-dev:i386 libssl-dev libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata libtinfo6:i386 libtbb2:i386 libtinfo5:i386 libcurl4-gnutls-dev:i386 libcurl4:i386 libncurses5:i386 libcurl3-gnutls:i386 faketime:i386 libtbb2:i386 \
- && apt -y install lib32tinfo6 lib32stdc++6 lib32z1 libtbb2 libtinfo5 libstdc++6 readline-common libncursesw5 libfontconfig1 libnss-wrapper gettext-base libc++-dev libc6-i386 libcurl4 libc6 libc6:i386 libssl3 libssl3:i386 libc6 libc6:i386 xvfb gdb libc++-dev
+ && apt -y install lib32tinfo6 lib32stdc++6 lib32z1 libtbb2 libtinfo5 libstdc++6 readline-common libncursesw5 libfontconfig1 libnss-wrapper gettext-base libc++-dev libc6-i386 libcurl4 libc6 libc6:i386 libssl3 libssl3:i386 libc6 libc6:i386 xvfb gdb libc++-dev tini
RUN useradd -d /home/container -m container
@@ -29,5 +29,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ../entrypoint.sh /entrypoint.sh
-CMD [ "/bin/bash", "/entrypoint.sh" ]
\ No newline at end of file
+COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
From 0cc5ef236958b903af0a005e628697d35138b326 Mon Sep 17 00:00:00 2001
From: Quinten <josdekurk@gmail.com>
Date: Wed, 19 Jul 2023 18:20:40 +0200
Subject: [PATCH 2/8] tini part 2
---
bot/bastion/Dockerfile | 8 +++++---
bot/red/Dockerfile | 8 +++++---
bot/sinusbot/Dockerfile | 8 +++++---
dart/2.17/Dockerfile | 8 +++++---
dart/2.18/Dockerfile | 8 +++++---
dart/2.19/Dockerfile | 8 +++++---
dotnet/2.1/Dockerfile | 8 +++++---
dotnet/3.1/Dockerfile | 8 +++++---
dotnet/5/Dockerfile | 8 +++++---
dotnet/6/Dockerfile | 8 +++++---
dotnet/7/Dockerfile | 9 +++++----
games/altv/Dockerfile | 8 +++++---
games/samp/Dockerfile | 8 +++++---
games/source/Dockerfile | 8 +++++---
rust/1.31/Dockerfile | 8 +++++---
rust/1.56/Dockerfile | 8 +++++---
rust/1.60/Dockerfile | 8 +++++---
rust/latest/Dockerfile | 8 +++++---
voice/mumble/Dockerfile | 8 +++++---
voice/teaspeak/Dockerfile | 8 +++++---
20 files changed, 100 insertions(+), 61 deletions(-)
diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile
index 056a8139c..a7c25fe20 100644
--- a/bot/bastion/Dockerfile
+++ b/bot/bastion/Dockerfile
@@ -8,7 +8,7 @@ RUN apt update && apt install --no-install-recommends -y curl \
&& apt install -y nodejs \
&& npm install -g npm@latest \
## install bastion reqs
- && apt install -y python3 build-essential git libtool netcat ffmpeg iproute2 tzdata \
+ && apt install -y python3 build-essential git libtool netcat ffmpeg iproute2 tzdata tini \
## add container user
&& useradd -d /home/container -m container -s /bin/bash
@@ -16,5 +16,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile
index 025ef37a8..b5aa6f393 100644
--- a/bot/red/Dockerfile
+++ b/bot/red/Dockerfile
@@ -4,7 +4,7 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN mkdir -p /usr/share/man/man1 \
&& apt update \
- && apt -y install git ca-certificates dnsutils iproute2 wget curl xz-utils git openjdk-11-jre \
+ && apt -y install git ca-certificates dnsutils iproute2 wget curl xz-utils git openjdk-11-jre tini \
zlib1g-dev libffi-dev git libmagickwand-dev unzip libaa1-dev build-essential tk-dev libncurses5-dev libncursesw5-dev libreadline6-dev libdb5.3-dev libgdbm-dev libsqlite3-dev libssl-dev libbz2-dev libexpat1-dev liblzma-dev ffmpeg imagemagick \
&& pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil \
&& useradd -m -d /home/container container \
@@ -15,5 +15,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
diff --git a/bot/sinusbot/Dockerfile b/bot/sinusbot/Dockerfile
index 24c43a825..5e45202ec 100644
--- a/bot/sinusbot/Dockerfile
+++ b/bot/sinusbot/Dockerfile
@@ -10,7 +10,7 @@ RUN apt update \
&& apt upgrade -y \
&& apt install -y ca-certificates less locales pulseaudio python python3 sudo x11vnc x11-xkb-utils xvfb iproute2 ffmpeg curl liblcms2-2 libatomic1 libxcb-xinerama0 fontconfig \
libasound2 libegl1-mesa libglib2.0-0 libnss3 libpci3 libpulse0 libxcursor1 libxslt1.1 libx11-xcb1 libxkbcommon0 bzip2 libxss1 libxcomposite1 libevent-2.1-7 libxcb-icccm4 \
- libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 \
+ libxcb-image0 libxcb-keysyms1 libxcb-render-util0 libxcb-xkb1 libxkbcommon-x11-0 tini \
&& useradd -m -d /home/container container
@@ -21,5 +21,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
\ No newline at end of file
diff --git a/dart/2.17/Dockerfile b/dart/2.17/Dockerfile
index 0bdbbe8fd..00ed7f6e1 100644
--- a/dart/2.17/Dockerfile
+++ b/dart/2.17/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.17
LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \
- && apt -y install iproute2 git ca-certificates tzdata \
+ && apt -y install iproute2 git ca-certificates tzdata tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dart/2.18/Dockerfile b/dart/2.18/Dockerfile
index 1bb02abf0..0642886d4 100644
--- a/dart/2.18/Dockerfile
+++ b/dart/2.18/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.18
LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \
- && apt -y install iproute2 git ca-certificates tzdata \
+ && apt -y install iproute2 git ca-certificates tzdata tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dart/2.19/Dockerfile b/dart/2.19/Dockerfile
index a303ed3cd..e479775a7 100644
--- a/dart/2.19/Dockerfile
+++ b/dart/2.19/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.19
LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \
- && apt -y install iproute2 git ca-certificates tzdata \
+ && apt -y install iproute2 git ca-certificates tzdata tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile
index 7e21db000..7f6f1fdfa 100644
--- a/dotnet/2.1/Dockerfile
+++ b/dotnet/2.1/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \
&& apt upgrade -y \
- && apt install -y apt-transport-https wget curl iproute2 libgdiplus \
+ && apt install -y apt-transport-https wget curl iproute2 libgdiplus tini \
&& wget https://dot.net/v1/dotnet-install.sh \
&& D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/2.1 | grep -i '<h3 id="sdk-2.*">SDK 2.1.*</h3>' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
&& chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile
index 1c6b483b0..b8c57e577 100644
--- a/dotnet/3.1/Dockerfile
+++ b/dotnet/3.1/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \
&& apt upgrade -y \
- && apt install -y apt-transport-https wget curl iproute2 libgdiplus \
+ && apt install -y apt-transport-https wget curl iproute2 libgdiplus tini \
&& wget https://dot.net/v1/dotnet-install.sh \
&& D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/3.1 | grep -i '<h3 id="sdk-3.*">SDK 3.1.*</h3>' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
&& chmod +x dotnet-install.sh \
@@ -18,5 +18,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index 5a347cdb7..a0ca5d60a 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \
&& apt upgrade -y \
- && apt install -y apt-transport-https wget curl iproute2 libgdiplus \
+ && apt install -y apt-transport-https wget curl iproute2 libgdiplus tini \
&& wget https://dot.net/v1/dotnet-install.sh \
&& D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/5.0 | grep -i '<h3 id="sdk-5.*">SDK 5.*.*</h3>' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
&& chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile
index 6d696c668..ccf8eed3c 100644
--- a/dotnet/6/Dockerfile
+++ b/dotnet/6/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \
&& apt upgrade -y \
- && apt install -y apt-transport-https wget curl iproute2 libgdiplus \
+ && apt install -y apt-transport-https wget curl iproute2 libgdiplus tini \
&& wget https://dot.net/v1/dotnet-install.sh \
&& D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/6.0 | grep -i '<h3 id="sdk-6.*">SDK 6.*.*</h3>' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
&& chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/dotnet/7/Dockerfile b/dotnet/7/Dockerfile
index 5b6d45426..f4bed8312 100644
--- a/dotnet/7/Dockerfile
+++ b/dotnet/7/Dockerfile
@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \
&& apt upgrade -y \
- && apt install -y apt-transport-https wget curl iproute2 libgdiplus \
+ && apt install -y apt-transport-https wget curl iproute2 libgdiplus tini \
&& wget https://dot.net/v1/dotnet-install.sh \
&& D_V="$(curl -sSL https://dotnet.microsoft.com/en-us/download/dotnet/7.0 | grep -i '<h3 id="sdk-7.*">SDK 7.*.*</h3>' | head -1 | awk -F\" '{print $3}' | awk '{print $2;}' | sed 's/<\/h3>//g')" \
&& chmod +x dotnet-install.sh \
@@ -17,6 +17,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-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"]
diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile
index 07a44efd4..67ea1cf30 100644
--- a/games/altv/Dockerfile
+++ b/games/altv/Dockerfile
@@ -13,7 +13,7 @@ RUN apt update -y \
&& apt upgrade -y \
&& apt install -y g++ gcc libgcc-s1 lib32gcc-s1 gdb libstdc++6 libc6 git wget curl tar zip unzip binutils xz-utils liblzo2-2 cabextract iproute2 net-tools netcat telnet libatomic1 libsdl1.2debian libsdl2-2.0-0 \
libfontconfig1 libicu67 icu-devtools libunwind8 libssl-dev sqlite3 libsqlite3-dev libmariadb-dev libduktape205 locales ffmpeg gnupg2 apt-transport-https software-properties-common ca-certificates tzdata \
- python3 dnsutils build-essential coreutils jq pcregrep
+ python3 dnsutils build-essential coreutils jq pcregrep tini
RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \
@@ -27,5 +27,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index 3ed39295e..586a358b3 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -7,7 +7,7 @@ RUN apt update \
RUN dpkg --add-architecture i386 \
&& apt update \
&& apt upgrade -y \
- && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip \
+ && apt install -y libstdc++6 lib32stdc++6 tar curl iproute2 openssl fontconfig dirmngr ca-certificates dnsutils tzdata zip tini \
&& apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386 \
&& useradd -d /home/container -m container
@@ -19,5 +19,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
diff --git a/games/source/Dockerfile b/games/source/Dockerfile
index f28a6b368..072a9256e 100644
--- a/games/source/Dockerfile
+++ b/games/source/Dockerfile
@@ -32,7 +32,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \
&& apt update \
&& apt upgrade -y \
- && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl \
+ && apt install -y tar curl gcc g++ lib32gcc-s1 libgcc1 libcurl4-gnutls-dev:i386 libssl1.1:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 iproute2 gdb libsdl1.2debian libfontconfig1 telnet net-tools netcat tzdata numactl tini \
&& useradd -m -d /home/container container
## install rcon
@@ -45,5 +45,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
diff --git a/rust/1.31/Dockerfile b/rust/1.31/Dockerfile
index 840bc9feb..ccc65bdd3 100644
--- a/rust/1.31/Dockerfile
+++ b/rust/1.31/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.31-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
RUN apt update \
- && apt -y install git dnsutils curl iproute2 ffmpeg \
+ && apt -y install git dnsutils curl iproute2 ffmpeg tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/1.56/Dockerfile b/rust/1.56/Dockerfile
index 9d3bed6bc..21bdf29dc 100644
--- a/rust/1.56/Dockerfile
+++ b/rust/1.56/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.56-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
RUN apt update \
- && apt -y install git dnsutils curl iproute2 ffmpeg \
+ && apt -y install git dnsutils curl iproute2 ffmpeg tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/1.60/Dockerfile b/rust/1.60/Dockerfile
index 5624cc24a..36d1ee13d 100644
--- a/rust/1.60/Dockerfile
+++ b/rust/1.60/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.60-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
RUN apt update \
- && apt -y install git dnsutils curl iproute2 ffmpeg \
+ && apt -y install git dnsutils curl iproute2 ffmpeg tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/rust/latest/Dockerfile b/rust/latest/Dockerfile
index 3d94aeb57..e29edeb49 100644
--- a/rust/latest/Dockerfile
+++ b/rust/latest/Dockerfile
@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
RUN apt update \
- && apt -y install git dnsutils curl iproute2 ffmpeg \
+ && apt -y install git dnsutils curl iproute2 ffmpeg tini \
&& useradd -m -d /home/container container
USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
-COPY ./../entrypoint.sh /entrypoint.sh
-CMD ["/bin/bash", "/entrypoint.sh"]
\ No newline at end of file
+COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
\ No newline at end of file
diff --git a/voice/mumble/Dockerfile b/voice/mumble/Dockerfile
index 7a7da1bd6..46c4a7253 100644
--- a/voice/mumble/Dockerfile
+++ b/voice/mumble/Dockerfile
@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT
## install dependencies
-RUN apk add --no-cache murmur
+RUN apk add --no-cache murmur tini
RUN adduser -D container
@@ -14,5 +14,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-CMD ["/bin/ash", "/entrypoint.sh"]
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
+RUN chmod +x /entrypoint.sh
+ENTRYPOINT ["/sbin/tini", "-g", "--"]
+CMD ["/entrypoint.sh"]
diff --git a/voice/teaspeak/Dockerfile b/voice/teaspeak/Dockerfile
index 3b4dea2e7..3480fc468 100644
--- a/voice/teaspeak/Dockerfile
+++ b/voice/teaspeak/Dockerfile
@@ -34,7 +34,7 @@ RUN apt update \
&& apt upgrade -y
## install dependencies
-RUN apt install -y ffmpeg curl python3 iproute2 libjemalloc2
+RUN apt install -y ffmpeg curl python3 iproute2 libjemalloc2 tini
# Install latest youtube-dl
RUN curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/youtube-dl
@@ -48,5 +48,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY ./entrypoint.sh /entrypoint.sh
-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"]
From ad58d353795d901a261aba0a0a0db0c1ed867093 Mon Sep 17 00:00:00 2001
From: Quinten <josdekurk@gmail.com>
Date: Wed, 19 Jul 2023 18:24:43 +0200
Subject: [PATCH 3/8] fix samp
---
games/samp/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index 586a358b3..2222b1398 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -19,7 +19,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
-COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
+COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]
From 3e04f0c22b33b60765e42718f6af27b3307a8321 Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Fri, 21 Jul 2023 14:50:45 +0200
Subject: [PATCH 4/8] Python: use SIGINT
---
python/2.7/Dockerfile | 2 ++
python/3.10/Dockerfile | 2 ++
python/3.11/Dockerfile | 2 ++
python/3.7/Dockerfile | 2 ++
python/3.8/Dockerfile | 2 ++
python/3.9/Dockerfile | 2 ++
6 files changed, 12 insertions(+)
diff --git a/python/2.7/Dockerfile b/python/2.7/Dockerfile
index efb20028f..eee04a58a 100644
--- a/python/2.7/Dockerfile
+++ b/python/2.7/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/python/3.10/Dockerfile b/python/3.10/Dockerfile
index d169043f9..ccfab6e90 100644
--- a/python/3.10/Dockerfile
+++ b/python/3.10/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/python/3.11/Dockerfile b/python/3.11/Dockerfile
index 6e1ea42fc..ee9cbd81c 100644
--- a/python/3.11/Dockerfile
+++ b/python/3.11/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/python/3.7/Dockerfile b/python/3.7/Dockerfile
index 535b8b99a..76c9dd879 100644
--- a/python/3.7/Dockerfile
+++ b/python/3.7/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/python/3.8/Dockerfile b/python/3.8/Dockerfile
index 0cda5e7eb..51928e396 100644
--- a/python/3.8/Dockerfile
+++ b/python/3.8/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/python/3.9/Dockerfile b/python/3.9/Dockerfile
index d39f3cb75..f4811df1b 100644
--- a/python/3.9/Dockerfile
+++ b/python/3.9/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
From 51a6752601e0890670686b20d285eca0a207a9f2 Mon Sep 17 00:00:00 2001
From: Quinten <josdekurk@gmail.com>
Date: Wed, 9 Aug 2023 19:19:43 +0200
Subject: [PATCH 5/8] Bots: use qemu V2
---
.github/workflows/bot.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.github/workflows/bot.yml b/.github/workflows/bot.yml
index c06159408..1133517f4 100644
--- a/.github/workflows/bot.yml
+++ b/.github/workflows/bot.yml
@@ -26,7 +26,7 @@ jobs:
with:
buildkitd-flags: --debug
- name: Set up QEMU
- uses: docker/setup-qemu-action@master
+ uses: docker/setup-qemu-action@v2
with:
platforms: arm64,amd64
- name: Cache Docker layers
From baf272435a557eaa98aa02e9b663b0b59a370942 Mon Sep 17 00:00:00 2001
From: Quinten <josdekurk@gmail.com>
Date: Wed, 9 Aug 2023 19:24:33 +0200
Subject: [PATCH 6/8] Use SIGINT as stop signal
---
bot/bastion/Dockerfile | 2 ++
bot/red/Dockerfile | 2 ++
bot/sinusbot/Dockerfile | 2 ++
dart/2.17/Dockerfile | 2 ++
dart/2.18/Dockerfile | 2 ++
dart/2.19/Dockerfile | 2 ++
dotnet/2.1/Dockerfile | 2 ++
dotnet/3.1/Dockerfile | 2 ++
dotnet/5/Dockerfile | 2 ++
dotnet/6/Dockerfile | 2 ++
dotnet/7/Dockerfile | 2 ++
games/altv/Dockerfile | 2 ++
games/samp/Dockerfile | 2 ++
games/source/Dockerfile | 2 ++
java/11/Dockerfile | 2 ++
java/11j9/Dockerfile | 2 ++
java/16/Dockerfile | 2 ++
java/16j9/Dockerfile | 2 ++
java/17/Dockerfile | 2 ++
java/19/Dockerfile | 2 ++
java/8/Dockerfile | 2 ++
java/8j9/Dockerfile | 2 ++
nodejs/12/Dockerfile | 1 +
nodejs/14/Dockerfile | 2 ++
nodejs/16/Dockerfile | 2 ++
nodejs/17/Dockerfile | 2 ++
nodejs/18/Dockerfile | 2 ++
nodejs/19/Dockerfile | 2 ++
nodejs/20/Dockerfile | 2 ++
oses/alpine/Dockerfile | 2 ++
oses/debian/Dockerfile | 2 ++
oses/ubuntu/Dockerfile | 2 ++
rust/1.31/Dockerfile | 2 ++
rust/1.56/Dockerfile | 2 ++
rust/1.60/Dockerfile | 2 ++
steamcmd/debian/Dockerfile | 2 ++
steamcmd/dotnet/Dockerfile | 2 ++
steamcmd/ubuntu/Dockerfile | 2 ++
voice/mumble/Dockerfile | 2 ++
voice/teaspeak/Dockerfile | 2 ++
40 files changed, 79 insertions(+)
diff --git a/bot/bastion/Dockerfile b/bot/bastion/Dockerfile
index a7c25fe20..f360d57da 100644
--- a/bot/bastion/Dockerfile
+++ b/bot/bastion/Dockerfile
@@ -16,6 +16,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile
index 30fc529e3..777686098 100644
--- a/bot/red/Dockerfile
+++ b/bot/red/Dockerfile
@@ -47,6 +47,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/bot/sinusbot/Dockerfile b/bot/sinusbot/Dockerfile
index 5e45202ec..388b34dc0 100644
--- a/bot/sinusbot/Dockerfile
+++ b/bot/sinusbot/Dockerfile
@@ -21,6 +21,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dart/2.17/Dockerfile b/dart/2.17/Dockerfile
index 00ed7f6e1..ef05342ea 100644
--- a/dart/2.17/Dockerfile
+++ b/dart/2.17/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dart/2.18/Dockerfile b/dart/2.18/Dockerfile
index 0642886d4..eda747af7 100644
--- a/dart/2.18/Dockerfile
+++ b/dart/2.18/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dart/2.19/Dockerfile b/dart/2.19/Dockerfile
index e479775a7..c01b351e1 100644
--- a/dart/2.19/Dockerfile
+++ b/dart/2.19/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dotnet/2.1/Dockerfile b/dotnet/2.1/Dockerfile
index 7f6f1fdfa..58dcaff37 100644
--- a/dotnet/2.1/Dockerfile
+++ b/dotnet/2.1/Dockerfile
@@ -17,6 +17,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dotnet/3.1/Dockerfile b/dotnet/3.1/Dockerfile
index b8c57e577..18fa76783 100644
--- a/dotnet/3.1/Dockerfile
+++ b/dotnet/3.1/Dockerfile
@@ -18,6 +18,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dotnet/5/Dockerfile b/dotnet/5/Dockerfile
index a0ca5d60a..5bafee2d1 100644
--- a/dotnet/5/Dockerfile
+++ b/dotnet/5/Dockerfile
@@ -17,6 +17,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dotnet/6/Dockerfile b/dotnet/6/Dockerfile
index ccf8eed3c..9494f7644 100644
--- a/dotnet/6/Dockerfile
+++ b/dotnet/6/Dockerfile
@@ -17,6 +17,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/dotnet/7/Dockerfile b/dotnet/7/Dockerfile
index f4bed8312..78a389a96 100644
--- a/dotnet/7/Dockerfile
+++ b/dotnet/7/Dockerfile
@@ -17,6 +17,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/games/altv/Dockerfile b/games/altv/Dockerfile
index 67ea1cf30..cd13464c3 100644
--- a/games/altv/Dockerfile
+++ b/games/altv/Dockerfile
@@ -27,6 +27,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/games/samp/Dockerfile b/games/samp/Dockerfile
index 2222b1398..0371afe4a 100644
--- a/games/samp/Dockerfile
+++ b/games/samp/Dockerfile
@@ -19,6 +19,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/games/source/Dockerfile b/games/source/Dockerfile
index 072a9256e..a67e91883 100644
--- a/games/source/Dockerfile
+++ b/games/source/Dockerfile
@@ -45,6 +45,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/11/Dockerfile b/java/11/Dockerfile
index bdf4acad4..e5db4d63a 100644
--- a/java/11/Dockerfile
+++ b/java/11/Dockerfile
@@ -13,6 +13,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/11j9/Dockerfile b/java/11j9/Dockerfile
index ff57bed05..6845adfb6 100644
--- a/java/11j9/Dockerfile
+++ b/java/11j9/Dockerfile
@@ -11,6 +11,8 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/16/Dockerfile b/java/16/Dockerfile
index 827c13792..3bd2c3fdb 100644
--- a/java/16/Dockerfile
+++ b/java/16/Dockerfile
@@ -13,6 +13,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/16j9/Dockerfile b/java/16j9/Dockerfile
index 3e378439d..5f788ad13 100644
--- a/java/16j9/Dockerfile
+++ b/java/16j9/Dockerfile
@@ -11,6 +11,8 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/17/Dockerfile b/java/17/Dockerfile
index cc4207f9e..738507745 100644
--- a/java/17/Dockerfile
+++ b/java/17/Dockerfile
@@ -13,6 +13,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/19/Dockerfile b/java/19/Dockerfile
index 53789ad37..f89e51e6d 100644
--- a/java/19/Dockerfile
+++ b/java/19/Dockerfile
@@ -13,6 +13,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/8/Dockerfile b/java/8/Dockerfile
index a80c737e6..6efba21e8 100644
--- a/java/8/Dockerfile
+++ b/java/8/Dockerfile
@@ -13,6 +13,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/java/8j9/Dockerfile b/java/8j9/Dockerfile
index 99086fe10..b52826801 100644
--- a/java/8j9/Dockerfile
+++ b/java/8j9/Dockerfile
@@ -11,6 +11,8 @@ ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/12/Dockerfile b/nodejs/12/Dockerfile
index 3d8482b7a..a0c101855 100644
--- a/nodejs/12/Dockerfile
+++ b/nodejs/12/Dockerfile
@@ -12,6 +12,7 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile
index 89a177933..76e80f362 100644
--- a/nodejs/14/Dockerfile
+++ b/nodejs/14/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/16/Dockerfile b/nodejs/16/Dockerfile
index 67d85d378..eab82c99b 100644
--- a/nodejs/16/Dockerfile
+++ b/nodejs/16/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/17/Dockerfile b/nodejs/17/Dockerfile
index 2cdbc7ea7..fdc0442ac 100644
--- a/nodejs/17/Dockerfile
+++ b/nodejs/17/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/18/Dockerfile b/nodejs/18/Dockerfile
index 3e8b89422..6b1bdc00d 100644
--- a/nodejs/18/Dockerfile
+++ b/nodejs/18/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/19/Dockerfile b/nodejs/19/Dockerfile
index df181eeec..84ad317a5 100644
--- a/nodejs/19/Dockerfile
+++ b/nodejs/19/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/nodejs/20/Dockerfile b/nodejs/20/Dockerfile
index 916d3ad4a..028e92037 100644
--- a/nodejs/20/Dockerfile
+++ b/nodejs/20/Dockerfile
@@ -12,6 +12,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/oses/alpine/Dockerfile b/oses/alpine/Dockerfile
index 633f72142..32eb44aef 100644
--- a/oses/alpine/Dockerfile
+++ b/oses/alpine/Dockerfile
@@ -34,6 +34,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
diff --git a/oses/debian/Dockerfile b/oses/debian/Dockerfile
index 20f9c213a..f47530bf5 100644
--- a/oses/debian/Dockerfile
+++ b/oses/debian/Dockerfile
@@ -29,6 +29,8 @@ RUN update-locale lang=en_US.UTF-8 \
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/oses/ubuntu/Dockerfile b/oses/ubuntu/Dockerfile
index 8f82496be..aec60e1d0 100644
--- a/oses/ubuntu/Dockerfile
+++ b/oses/ubuntu/Dockerfile
@@ -23,6 +23,8 @@ RUN update-locale lang=en_US.UTF-8 \
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/rust/1.31/Dockerfile b/rust/1.31/Dockerfile
index ccc65bdd3..011c8b180 100644
--- a/rust/1.31/Dockerfile
+++ b/rust/1.31/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/rust/1.56/Dockerfile b/rust/1.56/Dockerfile
index 21bdf29dc..2a33e681c 100644
--- a/rust/1.56/Dockerfile
+++ b/rust/1.56/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/rust/1.60/Dockerfile b/rust/1.60/Dockerfile
index 36d1ee13d..326202260 100644
--- a/rust/1.60/Dockerfile
+++ b/rust/1.60/Dockerfile
@@ -10,6 +10,8 @@ USER container
ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/steamcmd/debian/Dockerfile b/steamcmd/debian/Dockerfile
index 85a8d180b..0bcf8c946 100644
--- a/steamcmd/debian/Dockerfile
+++ b/steamcmd/debian/Dockerfile
@@ -23,6 +23,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/steamcmd/dotnet/Dockerfile b/steamcmd/dotnet/Dockerfile
index 977b34a5b..e90ae7595 100644
--- a/steamcmd/dotnet/Dockerfile
+++ b/steamcmd/dotnet/Dockerfile
@@ -30,6 +30,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/steamcmd/ubuntu/Dockerfile b/steamcmd/ubuntu/Dockerfile
index 332241e48..997e4f66c 100644
--- a/steamcmd/ubuntu/Dockerfile
+++ b/steamcmd/ubuntu/Dockerfile
@@ -29,6 +29,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
diff --git a/voice/mumble/Dockerfile b/voice/mumble/Dockerfile
index 46c4a7253..f22b79737 100644
--- a/voice/mumble/Dockerfile
+++ b/voice/mumble/Dockerfile
@@ -14,6 +14,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
diff --git a/voice/teaspeak/Dockerfile b/voice/teaspeak/Dockerfile
index 3480fc468..cc46233fe 100644
--- a/voice/teaspeak/Dockerfile
+++ b/voice/teaspeak/Dockerfile
@@ -48,6 +48,8 @@ USER container
ENV USER=container HOME=/home/container
WORKDIR /home/container
+STOPSIGNAL SIGINT
+
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
From 17c8e25f4eec3950902c61ff13c5560163d6d134 Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Tue, 26 Sep 2023 18:18:47 +0200
Subject: [PATCH 7/8] Add tini redbot
---
bot/red/Dockerfile | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/bot/red/Dockerfile b/bot/red/Dockerfile
index 777686098..d7963314d 100644
--- a/bot/red/Dockerfile
+++ b/bot/red/Dockerfile
@@ -33,7 +33,8 @@ RUN apt update \
libexpat1-dev \
liblzma-dev \
ffmpeg \
- imagemagick
+ imagemagick \
+ tini
RUN pip install --upgrade pip
RUN pip install python-forecastio tweepy unidecode discord-text-sanitizer mcstatus bs4 sqlalchemy geocoder valve python-valve py-cpuinfo psutil
From 672f6722e386b7cde070e3a1869b36d963ae0e46 Mon Sep 17 00:00:00 2001
From: Quinten <67589015+QuintenQVD0@users.noreply.github.com>
Date: Tue, 26 Sep 2023 18:21:31 +0200
Subject: [PATCH 8/8] nodejs:14 remove extra tab
---
nodejs/14/Dockerfile | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/nodejs/14/Dockerfile b/nodejs/14/Dockerfile
index 84705a381..fe2764d4d 100644
--- a/nodejs/14/Dockerfile
+++ b/nodejs/14/Dockerfile
@@ -4,7 +4,7 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN apt update \
&& apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool iputils-ping libnss3 tini \
- && useradd -m -d /home/container container
+ && useradd -m -d /home/container container
RUN npm install npm@9.8.1 typescript ts-node @types/node --location=global