casjaysdevdocker/caddy
1
0
Fork 0
mirror of https://github.com/casjaysdevdocker/caddy synced 2026-08-09 02:01:14 -04:00
Code Issues Actions Packages Projects Releases Wiki Activity

🐛 Remove stale local function definitions from init.d script 🐛
caddy / release-caddy (push) Failing after 1m19s
Details

Browse Source 
__pcheck and __pgrep were locally defined in init.d scripts before they
were added to the shared docker-entrypoint functions library. These local
copies shadow the improved library versions and prevent library updates
from taking effect.
- rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh: remove stale local __pcheck/__pgrep definitions and their intro comment; defer to shared library

rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
This commit is contained in:
jason
2026-06-26 18:47:23 -04:00
parent d7f9133e1f
commit 05b9ead706
2 changed files with 0 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
rootfs/usr/local/etc/docker/init.d/01-php-fpm.sh
-4
View File
@@ -123,9 +123,6 @@ __run_start_script() {
esac esac
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# process check functions
__pcheck() { [ -n "$(type -P pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null && return 0 || return 10; }
__pgrep() { __pcheck "${1:-EXEC_CMD_BIN}" || __ps aux 2>/dev/null | grep -Fw " ${1:-$EXEC_CMD_BIN}" | grep -qv ' grep' | grep '^' && return 0 || return 10; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Allow ENV_ variable # Allow ENV_ variable
# Import env file # Import env file
@@ -156,7 +153,6 @@ if [ ! -f "$(type -P "$EXEC_CMD_BIN")" ] && [ -z "$EXEC_CMD_BIN" ]; then
exit 2 exit 2
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# check if process is already running
if __pgrep "$EXEC_CMD_BIN"; then if __pgrep "$EXEC_CMD_BIN"; then
SERVICE_IS_RUNNING="true" SERVICE_IS_RUNNING="true"
echo "$EXEC_CMD_BIN is running" echo "$EXEC_CMD_BIN is running"
rootfs/usr/local/etc/docker/init.d/zz-caddy.sh
-4
View File
@@ -118,9 +118,6 @@ __run_start_script() {
esac esac
} }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# process check functions
__pcheck() { [ -n "$(type -P pgrep 2>/dev/null)" ] && pgrep -x "$1" &>/dev/null && return 0 || return 10; }
__pgrep() { __pcheck "${1:-EXEC_CMD_BIN}" || __ps aux 2>/dev/null | grep -Fw " ${1:-$EXEC_CMD_BIN}" | grep -qv ' grep' | grep '^' && return 0 || return 10; }
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# Allow ENV_ variable # Allow ENV_ variable
# Import env file # Import env file
@@ -151,7 +148,6 @@ if [ ! -f "$(type -P "$EXEC_CMD_BIN")" ] && [ -z "$EXEC_CMD_BIN" ]; then
exit 2 exit 2
fi fi
# - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - # - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
# check if process is already running
if __pgrep "$EXEC_CMD_BIN"; then if __pgrep "$EXEC_CMD_BIN"; then
SERVICE_IS_RUNNING="true" SERVICE_IS_RUNNING="true"
echo "$EXEC_CMD_BIN is running" echo "$EXEC_CMD_BIN is running"