Skip to content

Commit

Permalink
Merge pull request #204 from parkervcp/tini-2
Browse files Browse the repository at this point in the history 
Add tini to some more images + fix Postgress stop
  • Loading branch information
@parkervcp
parkervcp authored Nov 19, 2023
2 parents fa14c76 + 5023aa8 commit 72650fe
Show file tree
Hide file tree
Showing 16 changed files with 119 additions and 50 deletions.
11 changes: 8 additions & 3 deletions apps/uptimekuma/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
11 changes: 7 additions & 4 deletions bun/canary/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
11 changes: 7 additions & 4 deletions bun/latest/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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"]
11 changes: 7 additions & 4 deletions elixir/1.12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
11 changes: 7 additions & 4 deletions elixir/1.13/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
11 changes: 7 additions & 4 deletions elixir/1.14/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
11 changes: 7 additions & 4 deletions elixir/1.15/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
11 changes: 7 additions & 4 deletions elixir/latest/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
12 changes: 8 additions & 4 deletions games/dayz/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"]
10 changes: 7 additions & 3 deletions games/valheim/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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 \
Expand All @@ -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"]
10 changes: 8 additions & 2 deletions postgres/10/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
10 changes: 8 additions & 2 deletions postgres/11/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
10 changes: 8 additions & 2 deletions postgres/12/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
10 changes: 8 additions & 2 deletions postgres/13/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
10 changes: 8 additions & 2 deletions postgres/14/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]
9 changes: 7 additions & 2 deletions postgres/9/Dockerfile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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"]

0 comments on commit 72650fe

Please sign in to comment.