tini part 2

This commit is contained in:
Quinten
2023-07-19 18:20:40 +02:00
parent e6c1b4cc4a
commit 0cc5ef2369
20 changed files with 100 additions and 61 deletions

View File

@@ -8,7 +8,7 @@ RUN apt update && apt install --no-install-recommends -y curl \
&& apt install -y nodejs \ && apt install -y nodejs \
&& npm install -g npm@latest \ && npm install -g npm@latest \
## install bastion reqs ## 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 ## add container user
&& useradd -d /home/container -m container -s /bin/bash && useradd -d /home/container -m container -s /bin/bash
@@ -16,5 +16,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -4,7 +4,7 @@ LABEL author="Michael Parker" maintainer="parker@pterodactyl.io"
RUN mkdir -p /usr/share/man/man1 \ RUN mkdir -p /usr/share/man/man1 \
&& apt update \ && 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 \ 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 \ && 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 \ && useradd -m -d /home/container container \
@@ -15,5 +15,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -10,7 +10,7 @@ RUN apt update \
&& apt upgrade -y \ && 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 \ && 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 \ 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 && useradd -m -d /home/container container
@@ -21,5 +21,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.17
LABEL author="Alden Bansemer" maintainer="alden@knoban.com" LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \ 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 && 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
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.18
LABEL author="Alden Bansemer" maintainer="alden@knoban.com" LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \ 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 && 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
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH dart:2.19
LABEL author="Alden Bansemer" maintainer="alden@knoban.com" LABEL author="Alden Bansemer" maintainer="alden@knoban.com"
RUN apt update \ 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 && 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
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \ RUN apt update -y \
&& apt upgrade -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 \ && 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')" \ && 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 \ && chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \ RUN apt update -y \
&& apt upgrade -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 \ && 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')" \ && 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 \ && chmod +x dotnet-install.sh \
@@ -18,5 +18,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \ RUN apt update -y \
&& apt upgrade -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 \ && 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')" \ && 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 \ && chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \ RUN apt update -y \
&& apt upgrade -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 \ && 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')" \ && 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 \ && chmod +x dotnet-install.sh \
@@ -17,5 +17,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ ENV DEBIAN_FRONTEND noninteractive
RUN apt update -y \ RUN apt update -y \
&& apt upgrade -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 \ && 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')" \ && 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 \ && chmod +x dotnet-install.sh \
@@ -17,6 +17,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -13,7 +13,7 @@ RUN apt update -y \
&& apt upgrade -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 \ && 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 \ 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 \ RUN wget https://packages.microsoft.com/config/debian/11/packages-microsoft-prod.deb -O packages-microsoft-prod.deb \
&& dpkg -i packages-microsoft-prod.deb \ && dpkg -i packages-microsoft-prod.deb \
@@ -27,5 +27,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -7,7 +7,7 @@ RUN apt update \
RUN dpkg --add-architecture i386 \ RUN dpkg --add-architecture i386 \
&& apt update \ && apt update \
&& apt upgrade -y \ && 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 \ && apt install -y libtbb2:i386 libtbb-dev:i386 libicu-dev:i386 \
&& useradd -d /home/container -m container && useradd -d /home/container -m container
@@ -19,5 +19,7 @@ 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 COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -32,7 +32,7 @@ ENV DEBIAN_FRONTEND=noninteractive
RUN dpkg --add-architecture i386 \ RUN dpkg --add-architecture i386 \
&& apt update \ && apt update \
&& apt upgrade -y \ && 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 && useradd -m -d /home/container container
## install rcon ## install rcon
@@ -45,5 +45,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD [ "/bin/bash", "/entrypoint.sh" ] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.31-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com" LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
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 CARGO_HOME=/home/container/.cargo ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.56-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com" LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
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 CARGO_HOME=/home/container/.cargo ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:1.60-slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com" LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
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 CARGO_HOME=/home/container/.cargo ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -3,12 +3,14 @@ FROM --platform=$TARGETOS/$TARGETARCH rust:slim
LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com" LABEL author="Ethan Coward" maintainer="ethan.coward@icloud.com"
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 CARGO_HOME=/home/container/.cargo ENV USER=container HOME=/home/container CARGO_HOME=/home/container/.cargo
WORKDIR /home/container WORKDIR /home/container
COPY ./../entrypoint.sh /entrypoint.sh COPY --chown=container:container ./../entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -6,7 +6,7 @@ LABEL org.opencontainers.image.source="https://github.com/pterodactyl/yolks"
LABEL org.opencontainers.image.licenses=MIT LABEL org.opencontainers.image.licenses=MIT
## install dependencies ## install dependencies
RUN apk add --no-cache murmur RUN apk add --no-cache murmur tini
RUN adduser -D container RUN adduser -D container
@@ -14,5 +14,7 @@ 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 COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/ash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/sbin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]

View File

@@ -34,7 +34,7 @@ RUN apt update \
&& apt upgrade -y && apt upgrade -y
## install dependencies ## 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 # Install latest youtube-dl
RUN curl -L https://yt-dl.org/downloads/latest/youtube-dl -o /usr/local/bin/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 ENV USER=container HOME=/home/container
WORKDIR /home/container WORKDIR /home/container
COPY ./entrypoint.sh /entrypoint.sh COPY --chown=container:container ./entrypoint.sh /entrypoint.sh
CMD ["/bin/bash", "/entrypoint.sh"] RUN chmod +x /entrypoint.sh
ENTRYPOINT ["/usr/bin/tini", "-g", "--"]
CMD ["/entrypoint.sh"]