From 83436eb3b690d6929146f500127c74c191c43908 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:29:52 +0100 Subject: [PATCH 1/8] add tini: Uptimekuma --- apps/uptimekuma/Dockerfile | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index 06c1f5675..74d2a280e 100644 --- a/apps/uptimekuma/Dockerfile +++ b/apps/uptimekuma/Dockerfile @@ -29,7 +29,8 @@ RUN apk add --no-cache \ sqlite \ tzdata \ zip \ - libc6-compat + libc6-compat \ + tini # updating npm RUN npm install npm@latest -g @@ -49,5 +50,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"] \ No newline at end of file From 3ef00bd2161b3e30f3729e05254c677ee8b9807e Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:31:42 +0100 Subject: [PATCH 2/8] add tini to bun --- bun/canary/Dockerfile | 9 ++++++--- bun/latest/Dockerfile | 9 ++++++--- 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/bun/canary/Dockerfile b/bun/canary/Dockerfile index 5078d5d91..551d9d00c 100644 --- a/bun/canary/Dockerfile +++ b/bun/canary/Dockerfile @@ -12,6 +12,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +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/bun/latest/Dockerfile b/bun/latest/Dockerfile index 57cd00e00..c5f701053 100644 --- a/bun/latest/Dockerfile +++ b/bun/latest/Dockerfile @@ -12,6 +12,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] From 816a447e3a4cfd342c9a4a499b1a876424d0a41a Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:32:24 +0100 Subject: [PATCH 3/8] add forgoten STOPSIGNAL to uptimekuma --- apps/uptimekuma/Dockerfile | 2 ++ 1 file changed, 2 insertions(+) diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index 74d2a280e..1f8b17bfe 100644 --- a/apps/uptimekuma/Dockerfile +++ b/apps/uptimekuma/Dockerfile @@ -50,6 +50,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", "--"] From ddce84116a0af836cd47109470e420764cb5a390 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:34:10 +0100 Subject: [PATCH 4/8] add tini: elixir --- elixir/1.12/Dockerfile | 9 ++++++--- elixir/1.13/Dockerfile | 9 ++++++--- elixir/1.14/Dockerfile | 9 ++++++--- elixir/1.15/Dockerfile | 9 ++++++--- elixir/latest/Dockerfile | 9 ++++++--- 5 files changed, 30 insertions(+), 15 deletions(-) diff --git a/elixir/1.12/Dockerfile b/elixir/1.12/Dockerfile index 35cc661ff..2e7f0d9c8 100644 --- a/elixir/1.12/Dockerfile +++ b/elixir/1.12/Dockerfile @@ -10,6 +10,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/elixir/1.13/Dockerfile b/elixir/1.13/Dockerfile index 79cc3dcf8..b7d78ed5e 100644 --- a/elixir/1.13/Dockerfile +++ b/elixir/1.13/Dockerfile @@ -10,6 +10,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/elixir/1.14/Dockerfile b/elixir/1.14/Dockerfile index f5f08ca0a..eacdc1cc9 100644 --- a/elixir/1.14/Dockerfile +++ b/elixir/1.14/Dockerfile @@ -10,6 +10,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/elixir/1.15/Dockerfile b/elixir/1.15/Dockerfile index 2449340f8..2903b15d8 100644 --- a/elixir/1.15/Dockerfile +++ b/elixir/1.15/Dockerfile @@ -10,6 +10,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/elixir/latest/Dockerfile b/elixir/latest/Dockerfile index 1eeb9f51a..ec60892a3 100644 --- a/elixir/latest/Dockerfile +++ b/elixir/latest/Dockerfile @@ -10,6 +10,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -ENTRYPOINT [] -COPY ./../entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] From 535e9f9c3edf2ab212c375a7137cfe7e0fbc9d08 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 11 Nov 2023 10:38:14 +0100 Subject: [PATCH 5/8] add tini: Valheim --- games/valheim/Dockerfile | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/games/valheim/Dockerfile b/games/valheim/Dockerfile index 9741d854a..eff4ecff6 100644 --- a/games/valheim/Dockerfile +++ b/games/valheim/Dockerfile @@ -34,5 +34,9 @@ RUN touch ${NSS_WRAPPER_PASSWD} ${NSS_WRAPPER_GROUP} \ ADD passwd.template /passwd.template -COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] From 71f1752fda1e9722fd00047ab2c19176eaa59d58 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 18 Nov 2023 14:16:12 +0100 Subject: [PATCH 6/8] Add tini and more packages to postgres --- postgres/10/Dockerfile | 10 ++++++++-- postgres/11/Dockerfile | 10 ++++++++-- postgres/12/Dockerfile | 10 ++++++++-- postgres/13/Dockerfile | 10 ++++++++-- postgres/14/Dockerfile | 10 ++++++++-- postgres/9/Dockerfile | 9 +++++++-- 6 files changed, 47 insertions(+), 12 deletions(-) diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile index 1a2c09d71..075d12e3b 100644 --- a/postgres/10/Dockerfile +++ b/postgres/10/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/11/Dockerfile b/postgres/11/Dockerfile index 4ed6f3838..992062e72 100644 --- a/postgres/11/Dockerfile +++ b/postgres/11/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/12/Dockerfile b/postgres/12/Dockerfile index e21d236b0..6dc5db190 100644 --- a/postgres/12/Dockerfile +++ b/postgres/12/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/13/Dockerfile b/postgres/13/Dockerfile index ed1d229ae..d86c0337f 100644 --- a/postgres/13/Dockerfile +++ b/postgres/13/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +COPY --chown=container:container ../entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/sbin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] diff --git a/postgres/14/Dockerfile b/postgres/14/Dockerfile index c41ec76a7..4c8b01978 100644 --- a/postgres/14/Dockerfile +++ b/postgres/14/Dockerfile @@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata fontconfig git openssl sqlite tar tzdata + USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +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/postgres/9/Dockerfile b/postgres/9/Dockerfile index fc94f1c46..d1b5840a6 100644 --- a/postgres/9/Dockerfile +++ b/postgres/9/Dockerfile @@ -8,9 +8,14 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io" # UID 999 is the default pterodactyl user RUN adduser -D -h /home/container container +RUN apk add --no-cache tini curl iproute2 ca-certificates fontconfig git openssl sqlite tar tzdata USER container ENV HOME /home/container WORKDIR /home/container -COPY ../entrypoint.sh /entrypoint.sh -CMD ["/bin/bash", "/entrypoint.sh"] +STOPSIGNAL SIGINT + +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 From a02fea5fd620eb6b0669fb9cfe471336025fadf0 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 18 Nov 2023 14:18:35 +0100 Subject: [PATCH 7/8] add tini to dayz --- games/dayz/Dockerfile | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/games/dayz/Dockerfile b/games/dayz/Dockerfile index 5778dd116..189aed32d 100644 --- a/games/dayz/Dockerfile +++ b/games/dayz/Dockerfile @@ -26,7 +26,8 @@ RUN dpkg --add-architecture i386 \ libstdc++6:i386 \ lib32stdc++6 \ libcap2 \ - libnss-wrapper + libnss-wrapper \ + tini ## Configure locale RUN update-locale lang=en_US.UTF-8 \ @@ -45,6 +46,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -## Copy over and execute entrypoint.sh -COPY ./entrypoint.sh /entrypoint.sh -CMD [ "/bin/bash", "/entrypoint.sh" ] +STOPSIGNAL SIGINT + +COPY --chown=container:container ./entrypoint.sh /entrypoint.sh +RUN chmod +x /entrypoint.sh +ENTRYPOINT ["/usr/bin/tini", "-g", "--"] +CMD ["/entrypoint.sh"] From 5023aa8715af4b0f01bea86298519271ee0ac3c4 Mon Sep 17 00:00:00 2001 From: Quinten <67589015+QuintenQVD0@users.noreply.github.com> Date: Sat, 18 Nov 2023 18:42:27 +0100 Subject: [PATCH 8/8] install tini --- bun/canary/Dockerfile | 2 +- bun/latest/Dockerfile | 2 +- elixir/1.12/Dockerfile | 2 +- elixir/1.13/Dockerfile | 2 +- elixir/1.14/Dockerfile | 2 +- elixir/1.15/Dockerfile | 2 +- elixir/latest/Dockerfile | 2 +- games/valheim/Dockerfile | 2 +- 8 files changed, 8 insertions(+), 8 deletions(-) diff --git a/bun/canary/Dockerfile b/bun/canary/Dockerfile index 551d9d00c..8e4532663 100644 --- a/bun/canary/Dockerfile +++ b/bun/canary/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:canary LABEL author="MrAtox" maintainer="mratox@protonmail.com" 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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool tini \ && useradd -m -d /home/container container RUN bun upgrade diff --git a/bun/latest/Dockerfile b/bun/latest/Dockerfile index c5f701053..4338e0323 100644 --- a/bun/latest/Dockerfile +++ b/bun/latest/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:latest LABEL author="MrAtox" maintainer="mratox@protonmail.com" 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 \ + && apt -y install ffmpeg iproute2 git sqlite3 libsqlite3-dev python3 python3-dev ca-certificates dnsutils tzdata zip tar curl build-essential libtool tini \ && useradd -m -d /home/container container RUN bun upgrade diff --git a/elixir/1.12/Dockerfile b/elixir/1.12/Dockerfile index 2e7f0d9c8..7c9ff703a 100644 --- a/elixir/1.12/Dockerfile +++ b/elixir/1.12/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.12.3-slim LABEL author="MrAvox" maintainer="mravox@proton.me" 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 diff --git a/elixir/1.13/Dockerfile b/elixir/1.13/Dockerfile index b7d78ed5e..8298b48d7 100644 --- a/elixir/1.13/Dockerfile +++ b/elixir/1.13/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.13.4-slim LABEL author="MrAvox" maintainer="mravox@proton.me" 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 diff --git a/elixir/1.14/Dockerfile b/elixir/1.14/Dockerfile index eacdc1cc9..5aec208df 100644 --- a/elixir/1.14/Dockerfile +++ b/elixir/1.14/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.14.5-slim LABEL author="MrAvox" maintainer="mravox@proton.me" 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 diff --git a/elixir/1.15/Dockerfile b/elixir/1.15/Dockerfile index 2903b15d8..71c441e4b 100644 --- a/elixir/1.15/Dockerfile +++ b/elixir/1.15/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.15.4-slim LABEL author="MrAvox" maintainer="mravox@proton.me" 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 diff --git a/elixir/latest/Dockerfile b/elixir/latest/Dockerfile index ec60892a3..2d2d5b0ac 100644 --- a/elixir/latest/Dockerfile +++ b/elixir/latest/Dockerfile @@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:slim LABEL author="MrAvox" maintainer="mravox@proton.me" 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 diff --git a/games/valheim/Dockerfile b/games/valheim/Dockerfile index eff4ecff6..8dde544d3 100644 --- a/games/valheim/Dockerfile +++ b/games/valheim/Dockerfile @@ -14,7 +14,7 @@ RUN dpkg --add-architecture i386 \ && apt upgrade -y \ && apt install -y libcurl4-gnutls-dev:i386 libssl3:i386 libcurl4:i386 lib32tinfo6 libtinfo6:i386 lib32z1 lib32stdc++6 libncurses5:i386 libcurl3-gnutls:i386 libsdl2-2.0-0:i386 \ gcc g++ libgcc1 libc++-dev gdb libc6 curl tar iproute2 net-tools libatomic1 libsdl1.2debian libsdl2-2.0-0 \ - libfontconfig locales libcurl3-gnutls libpulse-dev libpulse0 libnss-wrapper gettext + libfontconfig locales libcurl3-gnutls libpulse-dev libpulse0 libnss-wrapper gettext tini ## configure locale RUN update-locale lang=en_US.UTF-8 \