Skip to content

Commit 630d211

Browse files
authored
Fix replace variable WITH_XDEBUG in nginx configuration (#218)
1 parent ab8be2b commit 630d211

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

images/nginx/1.9/docker-entrypoint.sh

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ XDEBUG_UPSTREAM_FILE="/etc/nginx/conf.d/xdebug/upstream.conf"
1414
[ ! -z "${MAGENTO_RUN_MODE}" ] && sed -i "s/!MAGENTO_RUN_MODE!/${MAGENTO_RUN_MODE}/" $VHOST_FILE
1515
[ ! -z "${MFTF_UTILS}" ] && sed -i "s/!MFTF_UTILS!/${MFTF_UTILS}/" $VHOST_FILE
1616
[ ! -z "${UPLOAD_MAX_FILESIZE}" ] && sed -i "s/!UPLOAD_MAX_FILESIZE!/${UPLOAD_MAX_FILESIZE}/" $VHOST_FILE
17+
[ ! -z "${WITH_XDEBUG}" ] && sed -i "s/!WITH_XDEBUG!/${WITH_XDEBUG}/" $VHOST_FILE
1718
[ "${WITH_XDEBUG}" == "1" ] && sed -i "s/#include_xdebug_upstream/include/" $NGINX_FILE
1819

1920
# Check if the nginx syntax is fine, then launch.

images/nginx/1.9/etc/vhost.conf

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ server {
1111
set $MAGE_ROOT !MAGENTO_ROOT!; # Variable: MAGENTO_ROOT
1212
set $MAGE_MODE !MAGENTO_RUN_MODE!; # Variable: MAGENTO_RUN_MODE
1313
set $MFTF_UTILS !MFTF_UTILS!; # Variable: MFTF_UTILS
14-
set $WITH_XDEBUG !$WITH_XDEBUG!; # Variable: WITH_XDEBUG
14+
set $WITH_XDEBUG !WITH_XDEBUG!; # Variable: WITH_XDEBUG
1515

1616
set $my_fastcgi_pass "fastcgi_backend";
1717
if ($cookie_XDEBUG_SESSION) {

0 commit comments

Comments
 (0)