From 015666adee0608dd6be84bb46fc06f054aee3f75 Mon Sep 17 00:00:00 2001 From: casjay Date: Fri, 31 Oct 2025 12:18:21 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=90=B3=20Update=20codebase=20=F0=9F=90=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile --- Dockerfile | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/Dockerfile b/Dockerfile index de03a54..b3f5012 100644 --- a/Dockerfile +++ b/Dockerfile @@ -16,7 +16,7 @@ ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" ARG EXPOSE_PORTS="53/tcp 53/udp" -ARG PHP_VERSION="php82" +ARG PHP_VERSION="php84" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" @@ -54,7 +54,7 @@ ARG PHP_SERVER ARG SHELL_OPTS ARG PATH -ARG PACK_LIST="bind bind-tools bind-dnssec-root bind-plugins nginx \php82-fpm tor " +ARG PACK_LIST="bind bind-tools bind-dnssec-root bind-plugins nginx $PHP_VERSION-fpm tor " ENV ENV=~/.profile ENV SHELL="/bin/sh" @@ -136,7 +136,7 @@ RUN echo "Updating system files "; \ RUN echo "Custom Settings"; \ $SHELL_OPTS; \ -echo "" + echo "" RUN echo "Setting up users and scripts "; \ $SHELL_OPTS; \ @@ -153,7 +153,7 @@ RUN echo "Setting OS Settings "; \ RUN echo "Custom Applications"; \ $SHELL_OPTS; \ -echo "" + echo "" RUN echo "Running custom commands"; \ if [ -f "/root/docker/setup/05-custom.sh" ];then echo "Running the custom script";/root/docker/setup/05-custom.sh||{ echo "Failed to execute /root/docker/setup/05-custom.sh" && exit 10; };echo "Done running the custom script";fi; \ @@ -252,5 +252,8 @@ VOLUME [ "/config","/data" ] EXPOSE ${SERVICE_PORT} ${ENV_PORTS} -ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" "start" ] +STOPSIGNAL SIGRTMIN+3 + +CMD [ "tail", "-f", "/dev/null" ] +ENTRYPOINT [ "tini", "-p", "SIGTERM","--", "/usr/local/bin/entrypoint.sh", "start" ] HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ]