Add tini and more packages to postgres

pelican-eggs · Nov 18, 2023 · 71f1752 · 71f1752
1 parent 535e9f9
commit 71f1752
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 12 deletions.
diff --git a/postgres/10/Dockerfile b/postgres/10/Dockerfile
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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
@@ -8,9 +8,15 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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"]
diff --git a/postgres/9/Dockerfile b/postgres/9/Dockerfile
@@ -8,9 +8,14 @@ LABEL author="Parker" maintainer="[email protected]"
 # 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"]