diff --git a/apps/uptimekuma/Dockerfile b/apps/uptimekuma/Dockerfile index 06c1f5675..1f8b17bfe 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,9 @@ USER container ENV USER=container HOME=/home/container WORKDIR /home/container -COPY ./entrypoint.sh /entrypoint.sh -CMD ["/bin/ash", "/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/bun/canary/Dockerfile b/bun/canary/Dockerfile index 5078d5d91..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 @@ -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..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 @@ -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"] diff --git a/elixir/1.12/Dockerfile b/elixir/1.12/Dockerfile index 35cc661ff..7c9ff703a 100644 --- a/elixir/1.12/Dockerfile +++ b/elixir/1.12/Dockerfile @@ -3,13 +3,16 @@ 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 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..8298b48d7 100644 --- a/elixir/1.13/Dockerfile +++ b/elixir/1.13/Dockerfile @@ -3,13 +3,16 @@ 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 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..5aec208df 100644 --- a/elixir/1.14/Dockerfile +++ b/elixir/1.14/Dockerfile @@ -3,13 +3,16 @@ 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 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..71c441e4b 100644 --- a/elixir/1.15/Dockerfile +++ b/elixir/1.15/Dockerfile @@ -3,13 +3,16 @@ 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 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..2d2d5b0ac 100644 --- a/elixir/latest/Dockerfile +++ b/elixir/latest/Dockerfile @@ -3,13 +3,16 @@ 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 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/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"] diff --git a/games/valheim/Dockerfile b/games/valheim/Dockerfile index 9741d854a..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 \ @@ -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"] 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