gh-mirrors/docker-php-fpm
1
0
Fork 0
mirror of https://github.com/devilbox/docker-php-fpm.git synced 2026-01-09 17:41:14 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Refs #30 Adding PHP-FPM 5.2

Browse Source
This commit is contained in:
cytopia
2018-08-02 13:24:41 +02:00
parent 523c936f65
commit 694a7c0fea
26 changed files with 1486 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
tests/base/04-test-run_nginx.sh
View File

@@ -71,7 +71,7 @@ run "sleep 10"
###
### Check correct PHP-FPM user
###
if ! docker_exec "${did}" "ps auxw | grep 'php-fpm: pool' | grep -v grep | awk '{ print \$1 }' | head -1 | grep devilbox"; then
if ! docker_exec "${did}" "ps auxw | grep -E '(php-fpm: pool|php-cgi)' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then
docker_exec "${did}" "ps auxw"
# Shutdown
@@ -82,17 +82,7 @@ if ! docker_exec "${did}" "ps auxw | grep 'php-fpm: pool' | grep -v grep | awk '
echo "Failed"
exit 1
fi
if ! docker_exec "${did}" "ps auxw | grep 'php-fpm: pool' | grep -v grep | awk '{ print \$1 }' | tail -1 | grep devilbox"; then
docker_exec "${did}" "ps auxw"
# Shutdown
docker_stop "${ndid}" || true
docker_stop "${did}" || true
rm -rf "${DOC_ROOT_HOST}"
rm -rf "${CONFIG_HOST}"
echo "Failed"
exit 1
fi
###