Merge branch 'master' of github.com:ngineered/nginx-php-fpm

Author: Ric Harvey

Dockerfile

@@ -1,6 +1,6 @@
 FROM php:7.1.11-fpm-alpine
 
-MAINTAINER Ric Harvey <ric@ngd.io>
+LABEL maintainer="Ric Harvey <ric@ngd.io>"
 
 ENV php_conf /usr/local/etc/php-fpm.conf
 ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf

conf/nginx-site-ssl.conf

@@ -60,7 +60,7 @@ server {
 		include fastcgi_params;
 	}
 
-        location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
+        location ~* \.(jpg|jpeg|gif|png|css|js|ico|webp|tiff|ttf|svg)$ {
                 expires           5d;
         }
 

conf/nginx-site.conf

@@ -53,7 +53,7 @@ server {
 		include fastcgi_params;
 	}
 
-        location ~* \.(jpg|jpeg|gif|png|css|js|ico|xml)$ {
+        location ~* \.(jpg|jpeg|gif|png|css|js|ico|webp|tiff|ttf|svg)$ {
                 expires           5d;
         }
 

docs/git_auth.md

@@ -2,7 +2,7 @@
 There are two methods of pulling code from git, you can either use a Personal Token (recommended method) or an SSH key.
 
 **Note:** We would recommend using a git personal token over an SSH key as it simplifies the set up process. To create a personal access token on Github follow this [guide](https://help.github.com/articles/creating-an-access-token-for-command-line-use/).
-If your repository is on BitBucket, you can create an "app password" and use it as the personnal access token. To get an app password for BitBucket, follow this [guide](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html).
+If your repository is on BitBucket, you can create an "app password" and use it as the personal access token. To get an app password for BitBucket, follow this [guide](https://confluence.atlassian.com/bitbucket/app-passwords-828781300.html).
 
 ### Personal Access token