From 994211c426769a7ff000a1beeae84b372b2c52bb Mon Sep 17 00:00:00 2001 From: casjay Date: Tue, 13 May 2025 18:25:48 -0400 Subject: [PATCH] =?UTF-8?q?=F0=9F=97=83=EF=B8=8F=20Committing=20everything?= =?UTF-8?q?=20that=20changed=20=F0=9F=97=83=EF=B8=8F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Dockerfile rootfs/usr/local/bin/entrypoint.sh --- Dockerfile | 3 +-- rootfs/usr/local/bin/entrypoint.sh | 21 +-------------------- 2 files changed, 2 insertions(+), 22 deletions(-) diff --git a/Dockerfile b/Dockerfile index 62a625e..0fc99d7 100644 --- a/Dockerfile +++ b/Dockerfile @@ -15,7 +15,7 @@ ARG USER="root" ARG SHELL_OPTS="set -e -o pipefail" ARG SERVICE_PORT="80" -ARG EXPOSE_PORTS="6800" +ARG EXPOSE_PORTS="6800 6888" ARG PHP_VERSION="system" ARG NODE_VERSION="system" ARG NODE_MANAGER="system" @@ -252,6 +252,5 @@ VOLUME [ "/config","/data" ] EXPOSE ${SERVICE_PORT} ${ENV_PORTS} -CMD [ "tail" ] ENTRYPOINT [ "tini","--","/usr/local/bin/entrypoint.sh" ] HEALTHCHECK --start-period=10m --interval=5m --timeout=15s CMD [ "/usr/local/bin/entrypoint.sh", "healthcheck" ] diff --git a/rootfs/usr/local/bin/entrypoint.sh b/rootfs/usr/local/bin/entrypoint.sh index d7148e8..76b4fc2 100755 --- a/rootfs/usr/local/bin/entrypoint.sh +++ b/rootfs/usr/local/bin/entrypoint.sh @@ -55,25 +55,6 @@ case "$1" in echo "" exit 0 ;; -tail) - shift 1 - case "$1" in - null) - shift $# - tail -f "/dev/null" - ;; - app) - shift $# - tail -f /data/logs/*/*.log - ;; - -*) - tail "$@" - ;; - *) - tail -f "${@:-/dev/null}" - ;; - esac - ;; -*) shift ;; @@ -412,7 +393,7 @@ __run_message START_SERVICES="${START_SERVICES:-SYSTEM_INIT}" # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Start all services if no pidfile -if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ] && [ "$1" != "cron" ] && [ "$1" != "logs" ] && [ "$1" != "cron" ]; then +if [ "$START_SERVICES" = "yes" ] && [ "$1" != "backup" ] && [ "$1" != "healthcheck" ] && [ "$1" != "cron" ] && [ "$1" != "tail" ] && [ "$1" != "logs" ] && [ "$1" != "cron" ]; then [ "$1" = "start" ] && shift 1 [ "$1" = "all" ] && shift 1 [ "$1" = "init" ] && export CONTAINER_INIT="yes"