Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update compile #382

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions bin/compile
Original file line number Diff line number Diff line change
Expand Up @@ -483,6 +483,11 @@ if [ -f "/app/vendor/php/etc/conf.d/newrelic.ini" ] ; then
fi
fi

if [ -f "/app/conf/nginx.conf.erb" ] ; then
export HAS_SERVER_CONF=true
erb /app/conf/servers.conf.erb > /app/conf/servers.conf
fi

erb conf/nginx.conf.erb > /app/vendor/nginx/conf/nginx.conf
erb conf/site.conf.erb > /app/vendor/nginx/conf/site.conf

Expand Down
2 changes: 1 addition & 1 deletion lib/composer
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,7 @@ function is_embedded_extension() {
[ ${rc} -ne 0 ] && \
error "error while trying to identify if ${extension_name} is embedded in runtime: ${php_modules} (${rc})."

if echo "${php_modules}" | grep --quiet --ignore-case "${extension_name}" ; then
if echo "${php_modules}" | grep --quiet --extended-regexp --ignore-case "^${extension_name}$" ; then
echo "true"
else
echo "false"
Expand Down