diff --git a/Dockerfile b/Dockerfile index 4b64763..f201e85 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM casjaysdevdocker/alpine:latest AS build +FROM casjaysdevdocker/php:latest AS build ARG ALPINE_VERSION="v3.16" diff --git a/rootfs/usr/local/bin/start-lighttpd b/rootfs/usr/local/bin/start-lighttpd index 8372ecf..4fd681f 100755 --- a/rootfs/usr/local/bin/start-lighttpd +++ b/rootfs/usr/local/bin/start-lighttpd @@ -19,7 +19,7 @@ # @@Template : other/start-service # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # Set functions -__pgrep() { ps aux 2>/dev/null | grep -F "$@" | grep -qv 'grep' || return 10; } +__pgrep() { ps aux 2>/dev/null | grep -Fw " $@" | grep -qv 'grep' || return 10; } __find() { find "$1" -mindepth 1 -type f,d 2>/dev/null | grep '^' || return 10; } __curl() { curl -q -LSsf -o /dev/null -s -w "200" "$@" 2>/dev/null || return 10; } # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -108,7 +108,7 @@ healthcheck) if __pgrep "$SERVICE_NAME"; then echo "$SERVICE_NAME is running" else - exec lighttpd -f /config/lighttpd.conf -D + exec lighttpd -f /config/lighttpd/lighttpd.conf -D fi ;; esac