From ed8e2410078343542d36675ef46acd96832274e8 Mon Sep 17 00:00:00 2001
From: Eric Pfeiffer <computerfreak@computerfr33k.com>
Date: Tue, 26 Jul 2016 11:19:31 -0500
Subject: [PATCH 1/3] use nginx:alpine as base.

---
 nginx/Dockerfile | 9 ++++-----
 nginx/nginx.conf | 5 +----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index 5dec1310..f05232d9 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -1,15 +1,14 @@
-FROM nginx:latest
+FROM nginx:alpine
 
 MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 
 ADD nginx.conf /etc/nginx/
-ADD laravel.conf /etc/nginx/sites-available/
+ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
 ARG PHP_UPSTREAM
 
-RUN echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
-
-RUN usermod -u 1000 www-data
+RUN rm /etc/nginx/conf.d/default.conf \
+    && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 CMD ["nginx"]
 
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 3e8dadde..a05c8385 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,6 +1,6 @@
-user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
+daemon off;
 
 events {
   worker_connections  2048;
@@ -23,8 +23,5 @@ http {
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;
-  include /etc/nginx/sites-available/*;
   open_file_cache max=100;
 }
-
-daemon off;

From e6cf30e7bae0962573ba341b45ce042605e114d9 Mon Sep 17 00:00:00 2001
From: Eric Pfeiffer <computerfreak@computerfr33k.com>
Date: Tue, 26 Jul 2016 12:41:52 -0500
Subject: [PATCH 2/3] re-added www-data user for nginx. log to stdout.

---
 nginx/Dockerfile | 8 ++++++--
 nginx/nginx.conf | 5 +++--
 2 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/nginx/Dockerfile b/nginx/Dockerfile
index f05232d9..f9bfc1ba 100644
--- a/nginx/Dockerfile
+++ b/nginx/Dockerfile
@@ -5,9 +5,13 @@ MAINTAINER Mahmoud Zalt <mahmoud@zalt.me>
 ADD nginx.conf /etc/nginx/
 ADD laravel.conf /etc/nginx/conf.d/laravel.conf
 
-ARG PHP_UPSTREAM
+ARG PHP_UPSTREAM=php-fpm
 
-RUN rm /etc/nginx/conf.d/default.conf \
+RUN apk update \
+    && apk upgrade \
+    && apk add --no-cache bash \
+    && adduser -D -H -u 1000 -s /bin/bash www-data \
+    && rm /etc/nginx/conf.d/default.conf \
     && echo "upstream php-upstream { server ${PHP_UPSTREAM}:9000; }" > /etc/nginx/conf.d/upstream.conf
 
 CMD ["nginx"]
diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index a05c8385..1b566087 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -1,3 +1,4 @@
+user www-data;
 worker_processes 4;
 pid /run/nginx.pid;
 daemon off;
@@ -18,8 +19,8 @@ http {
   client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log on;
-  error_log on;
+  access_log /dev/stdout;
+  error_log /dev/stderr;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;

From e4f6cec53694563d14f80404d788b5e3bd152684 Mon Sep 17 00:00:00 2001
From: Eric Pfeiffer <computerfreak@computerfr33k.com>
Date: Tue, 26 Jul 2016 12:53:26 -0500
Subject: [PATCH 3/3] fix nginx to actually log to files.

---
 nginx/nginx.conf | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/nginx/nginx.conf b/nginx/nginx.conf
index 1b566087..cc7fa68e 100644
--- a/nginx/nginx.conf
+++ b/nginx/nginx.conf
@@ -19,8 +19,8 @@ http {
   client_max_body_size 20M;
   include /etc/nginx/mime.types;
   default_type application/octet-stream;
-  access_log /dev/stdout;
-  error_log /dev/stderr;
+  access_log /var/log/nginx/access.log;
+  error_log /var/log/nginx/error.log;
   gzip on;
   gzip_disable "msie6";
   include /etc/nginx/conf.d/*.conf;