From 12fe84ae6b3e38b93d74cf61e2b128711de027e2 Mon Sep 17 00:00:00 2001
From: Jon <jonbjornn@gmail.com>
Date: Fri, 4 Dec 2015 09:34:49 -0800
Subject: [PATCH 1/3] Update PCRE version to fix broken compile step

---
 bin/compile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/compile b/bin/compile
index 97435ed..f003c9f 100755
--- a/bin/compile
+++ b/bin/compile
@@ -7,7 +7,7 @@ set -o pipefail
 # Nginx 1.6.2
 NGINX_VERSION="1.6.2"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
-PCRE_VERSION="8.36"
+PCRE_VERSION="8.38"
 PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"
 ZLIB_VERSION="1.2.8"
 ZLIB_TARBALL="zlib-${ZLIB_VERSION}.tar.gz"

From 7d773187bba68f7f2cb20ee638a7f624a52c184f Mon Sep 17 00:00:00 2001
From: Kyle Mattimore <kmattimo@umich.edu>
Date: Wed, 23 Dec 2015 14:14:33 -0500
Subject: [PATCH 2/3] restored ability to use custom mime.types

---
 bin/compile | 16 +++++++++++-----
 1 file changed, 11 insertions(+), 5 deletions(-)

diff --git a/bin/compile b/bin/compile
index f003c9f..76bd78a 100755
--- a/bin/compile
+++ b/bin/compile
@@ -26,8 +26,9 @@ if [[ ! -e "$BUILD_DIR/www" ]]; then
   mv $BUILD_DIR/* $CACHE_DIR/www
   mkdir -p $BUILD_DIR/www
   mv $CACHE_DIR/www/* $BUILD_DIR/www
-  # Check for an copy the nginx conf file override to the build dir
+  # Check for a copy the nginx conf file override to the build dir
   [[ -f "$BUILD_DIR/www/nginx.conf.erb" ]] && mv $BUILD_DIR/www/nginx.conf.erb $BUILD_DIR
+  [[ -f "$BUILD_DIR/www/mime.types" ]] && mv $BUILD_DIR/www/mime.types $BUILD_DIR
   [[ -f "$BUILD_DIR/www/CHECKS" ]] && mv $BUILD_DIR/www/CHECKS $BUILD_DIR
   rm -rf $CACHE_DIR/www
 fi
@@ -130,10 +131,15 @@ else
 fi
 
 # build mime.types unless overridden by user
-#if [ ! -f $BUILD_DIR/mime.types ] ; then
-echo "-----> using default mime.types"
-cp conf/mime.types $BUILD_DIR/nginx/mime.types
-#fi
+if [ -f $BUILD_DIR/mime.types ] ; then
+  echo "-----> using user provided mime.types"
+  cp $BUILD_DIR/mime.types $BUILD_DIR/nginx/mime.types
+
+else
+  echo "-----> using default mime.types"
+  cp conf/mime.types $BUILD_DIR/nginx/mime.types
+fi
+
 
 # build a startup script
 cat <<EOF >"$BUILD_DIR/start_nginx"

From ce6895ef38b6911fcd4378100f9ba6e5fbc85fa2 Mon Sep 17 00:00:00 2001
From: milanholy83 <milan.holy@gmail.com>
Date: Tue, 9 Feb 2016 11:28:01 +0100
Subject: [PATCH 3/3] nginx 1.8.1

---
 bin/compile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/compile b/bin/compile
index 76bd78a..593befe 100755
--- a/bin/compile
+++ b/bin/compile
@@ -4,8 +4,8 @@
 set -e
 set -o pipefail
 
-# Nginx 1.6.2
-NGINX_VERSION="1.6.2"
+# Nginx 1.8.1
+NGINX_VERSION="1.8.1"
 NGINX_TARBALL="nginx-${NGINX_VERSION}.tar.gz"
 PCRE_VERSION="8.38"
 PCRE_TARBALL="pcre-${PCRE_VERSION}.tar.gz"