🗃️ Committing everything that changed 🗃️

Dockerfile
rootfs/usr/local/bin/entrypoint.sh
This commit is contained in:
casjay 2025-05-13 18:25:48 -04:00
parent 9335999df1
commit 994211c426
Signed by untrusted user who does not match committer: jason
GPG Key ID: 1AB309F42A764145
2 changed files with 2 additions and 22 deletions

View File

@ -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" ]

View File

@ -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"