Merge pull request #204 from parkervcp/tini-2

Add tini to some more images + fix Postgress stop
This commit is contained in:
Michael (Parker) Parker
2023-11-19 12:37:05 -05:00
committed by GitHub
16 changed files with 119 additions and 50 deletions

View File

@@ -29,7 +29,8 @@ RUN apk add --no-cache \
sqlite \ sqlite \
tzdata \ tzdata \
zip \ zip \
libc6-compat libc6-compat \
tini
# updating npm # updating npm
RUN npm install npm@latest -g RUN npm install npm@latest -g
@@ -49,5 +50,9 @@ USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/ash", "/entrypoint.sh"]
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:canary
LABEL author="MrAtox" maintainer="mratox@protonmail.com" LABEL author="MrAtox" maintainer="mratox@protonmail.com"
RUN apt update \ 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 && useradd -m -d /home/container container
RUN bun upgrade RUN bun upgrade
@@ -12,6 +12,9 @@ USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,7 +3,7 @@ FROM --platform=$TARGETOS/$TARGETARCH oven/bun:latest
LABEL author="MrAtox" maintainer="mratox@protonmail.com" LABEL author="MrAtox" maintainer="mratox@protonmail.com"
RUN apt update \ 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 && useradd -m -d /home/container container
RUN bun upgrade RUN bun upgrade
@@ -12,6 +12,9 @@ USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,13 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.12.3-slim
LABEL author="MrAvox" maintainer="mravox@proton.me" LABEL author="MrAvox" maintainer="mravox@proton.me"
RUN apt update \ 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 && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,13 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.13.4-slim
LABEL author="MrAvox" maintainer="mravox@proton.me" LABEL author="MrAvox" maintainer="mravox@proton.me"
RUN apt update \ 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 && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,13 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.14.5-slim
LABEL author="MrAvox" maintainer="mravox@proton.me" LABEL author="MrAvox" maintainer="mravox@proton.me"
RUN apt update \ 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 && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,13 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:1.15.4-slim
LABEL author="MrAvox" maintainer="mravox@proton.me" LABEL author="MrAvox" maintainer="mravox@proton.me"
RUN apt update \ 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 && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -3,13 +3,16 @@ FROM --platform=$TARGETOS/$TARGETARCH elixir:slim
LABEL author="MrAvox" maintainer="mravox@proton.me" LABEL author="MrAvox" maintainer="mravox@proton.me"
RUN apt update \ 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 && useradd -m -d /home/container container
USER container USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
ENTRYPOINT [] STOPSIGNAL SIGINT
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"]

View File

@@ -26,7 +26,8 @@ RUN dpkg --add-architecture i386 \
libstdc++6:i386 \ libstdc++6:i386 \
lib32stdc++6 \ lib32stdc++6 \
libcap2 \ libcap2 \
libnss-wrapper libnss-wrapper \
tini
## Configure locale ## Configure locale
RUN update-locale lang=en_US.UTF-8 \ RUN update-locale lang=en_US.UTF-8 \
@@ -45,6 +46,9 @@ USER container
ENV USER=container HOME=/home/container ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
## Copy over and execute entrypoint.sh STOPSIGNAL SIGINT
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"]

View File

@@ -14,7 +14,7 @@ RUN dpkg --add-architecture i386 \
&& apt upgrade -y \ && 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 \ && 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 \ 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 ## configure locale
RUN update-locale lang=en_US.UTF-8 \ 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 ADD passwd.template /passwd.template
COPY ./entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD [ "/bin/bash", "/entrypoint.sh" ]
COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -8,9 +8,14 @@ LABEL author="Parker" maintainer="parker@pterodactyl.io"
# UID 999 is the default pterodactyl user # UID 999 is the default pterodactyl user
RUN adduser -D -h /home/container container 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 USER container
ENV HOME /home/container ENV HOME /home/container
WORKDIR /home/container WORKDIR /home/container
COPY ../entrypoint.sh /entrypoint.sh STOPSIGNAL SIGINT
CMD ["/bin/bash", "/entrypoint.sh"]
COPY --chown=container:container ../entrypoint.sh /entrypoint.sh
RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]