Merge pull request #2 from orleika/devel

Update v1.2

Author: orleika

.dockerignore

@@ -0,0 +1,2 @@
+.git
+conf.d

Dockerfile

@@ -1,4 +1,4 @@
-FROM alpine:3.4
+FROM alpine:latest
 
 MAINTAINER orleika <orleika.net@gmail.com>
 
@@ -94,9 +94,7 @@ RUN addgroup -S nginx \
   && rm -rf /tmp/*  /root/.gnupg
 
 COPY nginx.conf /etc/nginx/nginx.conf
-COPY headers_params /etc/nginx/conf.d/headers_params
-COPY proxy_params /etc/nginx/conf.d/proxy_params
-COPY ssl_params /etc/nginx/conf.d/ssl_params
+COPY log_format /etc/nginx/conf.d/log_format
 COPY default.conf /etc/nginx/sites-enabled/default.conf
 
 EXPOSE 80 443

README.md

@@ -4,21 +4,37 @@
 [![Build Status](https://img.shields.io/travis/orleika/docker-nginx/master.svg?style=flat-square)](https://travis-ci.org/orleika/docker-nginx)
 [![nginx](http://img.shields.io/badge/nginx-v1.11.9-blue.svg?style=flat-square)](https://nginx.org/en/download.html)
 [![LibreSSL](http://img.shields.io/badge/LibreSSL-v2.5.1-blue.svg?style=flat-square)](https://www.libressl.org/)
+[![standard-readme compliant](https://img.shields.io/badge/standard--readme-OK-green.svg?style=flat-square)](https://github.com/RichardLitt/standard-readme)
 
 > nginx docker image
 
+Small-Secure-Fast nginx docker image.  
+Base image is alpine, which is a security-oriented, lightweight Linux distribution. Most response headers are concealed, and DDoS mitigation is equipped. You should use secure headers included in `conf.d` for further safety considerations. Additionally, nginx caching parameters are optimized.  
+This image is automatically released by Docker Cloud.
+
 ## Table of Contents
 
+- [Install](#install)
 - [Usage](#usage)
+- [Contribute](#contribute)
 - [License](#license)
 
-## Usage
+## Install
 
 ```sh
 $ docker pull orleika/nginx
+```
+
+## Usage
+
+```sh
 $ docker run -d -p 80:80 orleika/nginx
 ```
 
+## Contribute
+
+PRs accepted.
+
 ## License
 
-This project is licensed under the MIT License - see the LICENSE file for details
+MIT © orleika

headers_params conf.d/headers_paramsheaders_params renamed to conf.d/headers_params

@@ -22,6 +22,7 @@ http {
     include /etc/nginx/mime.types;
     default_type application/octet-stream;
 
+    include /etc/nginx/conf.d/log_format;
     access_log /var/log/nginx/access.log combined;
     error_log /var/log/nginx/error.log crit;