Merge pull request nginx-proxy#276 from appropriate/nginx-1.9.6

jwilder · jwilder · commit 1e7136470e52 · 2015-10-29T13:31:34.000-06:00
Update to nginx 1.9.6
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM nginx:1.9.5
+FROM nginx:1.9.6
 MAINTAINER Jason Wilder jwilder@litl.com
 
 # Install wget and install/updates certificates
diff --git a/README.md b/README.md
@@ -1,4 +1,4 @@
-![nginx 1.9.5](https://img.shields.io/badge/nginx-1.9.5-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy)
+![nginx 1.9.6](https://img.shields.io/badge/nginx-1.9.6-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy)
 
 nginx-proxy sets up a container running nginx and [docker-gen][1].  docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.
 

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-FROM nginx:1.9.5`
	`1`	`+FROM nginx:1.9.6`
`2`	`2`	`MAINTAINER Jason Wilder jwilder@litl.com`
`3`	`3`
`4`	`4`	`# Install wget and install/updates certificates`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-![nginx 1.9.5](https://img.shields.io/badge/nginx-1.9.5-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy)`
	`1`	`+![nginx 1.9.6](https://img.shields.io/badge/nginx-1.9.6-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build](https://circleci.com/gh/jwilder/nginx-proxy.svg?&style=shield&circle-token=2da3ee844076a47371bd45da81cf27409ca7306a)](https://circleci.com/gh/jwilder/nginx-proxy)`
`2`	`2`
`3`	`3`	`nginx-proxy sets up a container running nginx and [docker-gen][1]. docker-gen generates reverse proxy configs for nginx and reloads nginx when containers are started and stopped.`
`4`	`4`