From e94a337f4e57e94c88a564e231d458b0be317ec6 Mon Sep 17 00:00:00 2001 From: Jeremy Schaffer Date: Wed, 11 Oct 2017 15:49:22 -0700 Subject: [PATCH 1/3] Changed MAINTAINER (depreciated) to label. --- Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Dockerfile b/Dockerfile index 570d5b1..bdf6c0b 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,6 +1,6 @@ FROM php:7.1.10-fpm-alpine -MAINTAINER Ric Harvey +LABEL maintainer="Ric Harvey " ENV php_conf /usr/local/etc/php-fpm.conf ENV fpm_conf /usr/local/etc/php-fpm.d/www.conf From 77cef20de964dbbff02a13e1514148a7b6fac206 Mon Sep 17 00:00:00 2001 From: Henri Larget Date: Fri, 20 Oct 2017 11:22:29 +0200 Subject: [PATCH 2/3] typo error in my previous commit. personnal -> personal --- docs/git_auth.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/docs/git_auth.md b/docs/git_auth.md index a09635e..5405230 100644 --- a/docs/git_auth.md +++ b/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 From 37bda26e3230bf3cbda43ad44884964d0854b363 Mon Sep 17 00:00:00 2001 From: svlentink Date: Thu, 26 Oct 2017 16:14:16 +0200 Subject: [PATCH 3/3] more static resources cached --- conf/nginx-site-ssl.conf | 2 +- conf/nginx-site.conf | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/conf/nginx-site-ssl.conf b/conf/nginx-site-ssl.conf index c468409..5a460b6 100644 --- a/conf/nginx-site-ssl.conf +++ b/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; } diff --git a/conf/nginx-site.conf b/conf/nginx-site.conf index d6fd777..31a967b 100644 --- a/conf/nginx-site.conf +++ b/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; }