Updated nginx config to look at base magento sample config file

CHANGELOG.md

@@ -8,6 +8,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.
 
 - New PHP 7.2 image is now available on the dev tag. Please report any issues.
 
+## [18.1.1] - 2018-10-08
+
+### Updated
+- Magento 2 nginx configuration now includes `nginx.conf.sample` file from root installation directory for configuration, instead of having standalone configuration.
+
 ## [18.0.1] - 2018-10-08
 
 ### Fixed

README.md

@@ -6,7 +6,8 @@ View Dockerfiles:
 
 - [markoshust/magento-nginx (Docker Hub)](https://hub.docker.com/r/markoshust/magento-nginx/)
   - 1.13
-      - [`latest`, `1.13`, `1.13-4`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+      - [`latest`, `1.13`, `1.13-5`](https://github.com/markoshust/docker-magento/tree/master/images/nginx/1.13)
+      - [`1.13-4`](https://github.com/markoshust/docker-magento/tree/18.0.1/images/nginx/1.13)
       - [`1.13-3`](https://github.com/markoshust/docker-magento/tree/15.0.1/images/nginx/1.13)
       - [`1.13-2`](https://github.com/markoshust/docker-magento/tree/12.0.0/images/nginx/1.13)
       - [`1.13-1`](https://github.com/markoshust/docker-magento/tree/11.1.5/images/nginx/1.13)

compose/magento-1/docker-compose.yml

@@ -1,5 +1,5 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.1
+# Version 18.1.1
 
 version: "3"
 

compose/magento-1/images/nginx/Dockerfile

@@ -1,3 +1,3 @@
-FROM markoshust/magento-nginx:1.13-4
+FROM markoshust/magento-nginx:1.13-5
 
 COPY ./conf/default.conf /etc/nginx/conf.d/

compose/magento-2-windows/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.1
+# Version 18.1.1
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-4
+    image: markoshust/magento-nginx:1.13-5
     ports:
       - 80:8000
     links:

compose/magento-2/docker-compose.yml

@@ -1,11 +1,11 @@
 # Mark Shust's Docker Configuration for Magento (https://github.com/markoshust/docker-magento)
-# Version 18.0.1
+# Version 18.1.1
 
 version: "3"
 
 services:
   app:
-    image: markoshust/magento-nginx:1.13-4
+    image: markoshust/magento-nginx:1.13-5
     ports:
       - 80:8000
     links:

images/nginx/1.13/conf/default.conf

@@ -4,174 +4,6 @@ upstream fastcgi_backend {
 
 server {
   listen 8000;
-  server_name localhost;
-
   set $MAGE_ROOT /var/www/html;
-  set $MAGE_MODE developer;
-
-  root $MAGE_ROOT/pub;
-
-  index index.php;
-  autoindex off;
-  charset off;
-
-  add_header 'X-Content-Type-Options' 'nosniff';
-
-  location /setup {
-    root $MAGE_ROOT;
-
-    location ~ ^/setup/index.php {
-      fastcgi_pass   fastcgi_backend;
-      fastcgi_index  index.php;
-      fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-      include    fastcgi_params;
-    }
-
-    location ~ ^/setup/(?!pub/). {
-      deny all;
-    }
-
-    location ~ ^/setup/pub/ {
-      add_header X-Frame-Options "SAMEORIGIN";
-    }
-  }
-  
-  location /update {
-    root $MAGE_ROOT;
-
-    location ~ ^/update/index.php {
-      fastcgi_split_path_info ^(/update/index.php)(/.+)$;
-      fastcgi_pass   fastcgi_backend;
-      fastcgi_index  index.php;
-      fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-      fastcgi_param  PATH_INFO    $fastcgi_path_info;
-      include    fastcgi_params;
-    }
-
-    # deny everything but index.php
-    location ~ ^/update/(?!pub/). {
-      deny all;
-    }
-
-    location ~ ^/update/pub/ {
-      add_header X-Frame-Options "SAMEORIGIN";
-    }
-  }
-
-  location / {
-    try_files $uri $uri/ /index.php?$args;
-  }
-  
-  location /pub {
-    location ~ ^/pub/media/(downloadable|customer|import|theme_customization/.*\.xml) {
-      deny all;
-    }
-
-    alias $MAGE_ROOT/pub;
-    add_header X-Frame-Options "SAMEORIGIN";
-  }
-  
-  location /static/ {
-    if ($MAGE_MODE = "production") {
-      expires max;
-    }
-
-    # remove signature of static files used to overcome browser cache
-    location ~ ^/static/version {
-      rewrite ^/static/(version\d*/)?(.*)$ /static/$2 last;
-    }
-
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
-      add_header Cache-Control "public";
-      add_header X-Frame-Options "SAMEORIGIN";
-      expires +1y;
-  
-      if (!-f $request_filename) {
-        rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-      }
-    }
-
-    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
-      add_header Cache-Control "no-store";
-      add_header X-Frame-Options "SAMEORIGIN";
-      expires off;
-      
-      if (!-f $request_filename) {
-         rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-      }
-    }
-
-    if (!-f $request_filename) {
-      rewrite ^/static/(version\d*/)?(.*)$ /static.php?resource=$2 last;
-    }
-
-    add_header X-Frame-Options "SAMEORIGIN";
-  }
-  
-  location /media/ {
-    try_files $uri $uri/ /get.php?$args;
-
-    location ~ ^/media/theme_customization/.*\.xml {
-      deny all;
-    }
-
-    location ~* \.(ico|jpg|jpeg|png|gif|svg|js|css|swf|eot|ttf|otf|woff|woff2)$ {
-      add_header Cache-Control "public";
-      add_header X-Frame-Options "SAMEORIGIN";
-      expires +1y;
-      try_files $uri $uri/ /get.php?$args;
-    }
-
-    location ~* \.(zip|gz|gzip|bz2|csv|xml)$ {
-      add_header Cache-Control "no-store";
-      add_header X-Frame-Options "SAMEORIGIN";
-      expires off;
-      try_files $uri $uri/ /get.php?$args;
-    }
-
-    add_header X-Frame-Options "SAMEORIGIN";
-  }
-  
-  location /media/customer/ {
-    deny all;
-  }
-  
-  location /media/downloadable/ {
-    deny all;
-  }
-  
-  location /media/import/ {                                                    
-    deny all;                                                              
-  }
-
-  location ~ /media/theme_customization/.*\.xml$ {
-    deny all;
-  }
-  
-  location /errors/ {
-    try_files $uri =404;
-  }
-  
-  location ~ ^/errors/.*\.(xml|phtml)$ {
-    deny all;
-  }
-  
-  location ~ cron\.php {
-    deny all;
-  }
-
-  location ~ (index|get|static|report|404|503)\.php$ {
-    try_files $uri =404;
-    fastcgi_pass   fastcgi_backend;
-  
-    fastcgi_param  PHP_FLAG  "session.auto_start=off \n suhosin.session.cryptua=off";
-    fastcgi_param  PHP_VALUE "max_execution_time=600";
-    fastcgi_read_timeout 600s;
-    fastcgi_connect_timeout 600s;
-    fastcgi_param  MAGE_MODE $MAGE_MODE;
-  
-    fastcgi_index  index.php;
-    fastcgi_param  SCRIPT_FILENAME  $document_root$fastcgi_script_name;
-    include    fastcgi_params;
-  }
+  include /var/www/html/nginx.conf.sample;
 }