Fix multi-store implementation

Author: davidwindell

Dockerfile

@@ -10,4 +10,8 @@ RUN wget -nv https://github.com/outeredge/edge-docker-magento/releases/download/
     sed -i '/$relativePath = $request->getPathInfo();/a $relativePath = ltrim(ltrim($relativePath, "media"), "/");' /var/www/pub/get.php && \
     chmod +x /var/www/bin/magento && \
     cp /var/www/nginx.conf.sample /etc/nginx/magento_default.conf && \
-    chown -R edge:edge /var/www
+    sed -i '/^#/d' /etc/nginx/magento_default.conf && \
+    sed -i "/fastcgi_backend/a \
+        fastcgi_param MAGE_MODE \$MAGE_MODE if_not_empty; \
+        fastcgi_param MAGE_RUN_CODE \$MAGE_RUN_CODE if_not_empty;" /etc/nginx/magento_default.conf && \
+    chown -R edge:edge /var/www

run.sh

@@ -4,12 +4,11 @@ if [ ! -z "$ADDITIONAL_STORES" ]; then
     while IFS=',' read -ra HOSTS; do
         for i in "${HOSTS[@]}"; do
             IFS=':' read -ra HOST <<< "$i"
-
             cp /etc/nginx/conf.d/default.conf /etc/nginx/conf.d/${HOST[0]}.conf
-            sed -i "/listen/a server_name ${HOST[1]};" /etc/nginx/conf.d/${HOST[0]}.conf
-            sed -i "/listen/a fastcgi_param MAGE_RUN_CODE ${HOST[0]};" /etc/nginx/conf.d/${HOST[0]}.conf
+            sed -i "/listen/a server_name ${HOST[1]};" /etc/nginx/conf.d/${HOST[0]}.conf            
             sed -i 's/ reuseport//g' /etc/nginx/conf.d/${HOST[0]}.conf
             sed -i 's/ default_server//g' /etc/nginx/conf.d/${HOST[0]}.conf
+            sed -i "/set \$MAGE_RUN_CODE/c\set \$MAGE_RUN_CODE ${HOST[0]};" /etc/nginx/conf.d/${HOST[0]}.conf
         done
     done <<< "$ADDITIONAL_STORES"
 fi

templates/nginx-default.conf.j2

@@ -2,10 +2,9 @@ server {
     listen 80 default_server reuseport;
 
     set $MAGE_ROOT /var/www;
-    {% if MAGE_MODE is defined and MAGE_MODE %}
-    set $MAGE_MODE {{ MAGE_MODE }};
-    {% endif %}
-
-    include magento_*.conf;
+    set $MAGE_MODE "{% if MAGE_MODE is defined %}{{ MAGE_MODE }}{% endif %}";
+    set $MAGE_RUN_CODE "{% if MAGE_RUN_CODE is defined %}{{ MAGE_RUN_CODE }}{% endif %}";
+    
+    include magento_default.conf;
     include security.conf;
 }