From ed8e2410078343542d36675ef46acd96832274e8 Mon Sep 17 00:00:00 2001 From: Eric Pfeiffer Date: Tue, 26 Jul 2016 11:19:31 -0500 Subject: [PATCH] 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 5dec131..f05232d 100644 --- a/nginx/Dockerfile +++ b/nginx/Dockerfile @@ -1,15 +1,14 @@ -FROM nginx:latest +FROM nginx:alpine MAINTAINER Mahmoud Zalt 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 3e8dadd..a05c838 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;