浏览代码

Merge pull request #518 from huiwang/nginx_upgrade

upgrade nginx to 1.11.3
Jason Wilder 8 年之前
父节点
当前提交
579bc1bf6e
共有 3 个文件被更改,包括 3 次插入3 次删除
  1. 1 1
      Dockerfile
  2. 1 1
      Makefile
  3. 1 1
      README.md

+ 1 - 1
Dockerfile

@@ -1,4 +1,4 @@
-FROM nginx:1.9.15
+FROM nginx:1.11.3
 MAINTAINER Jason Wilder mail@jasonwilder.com
 MAINTAINER Jason Wilder mail@jasonwilder.com
 
 
 # Install wget and install/updates certificates
 # Install wget and install/updates certificates

+ 1 - 1
Makefile

@@ -3,7 +3,7 @@
 
 
 update-dependencies:
 update-dependencies:
 	docker pull jwilder/docker-gen:0.7.3
 	docker pull jwilder/docker-gen:0.7.3
-	docker pull nginx:1.9.12
+	docker pull nginx:1.11.3
 	docker pull python:3
 	docker pull python:3
 	docker pull rancher/socat-docker:latest
 	docker pull rancher/socat-docker:latest
 	docker pull appropriate/curl:latest
 	docker pull appropriate/curl:latest

+ 1 - 1
README.md

@@ -1,4 +1,4 @@
-![nginx 1.9.15](https://img.shields.io/badge/nginx-1.9.15-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build Status](https://travis-ci.org/jwilder/nginx-proxy.svg?branch=master)](https://travis-ci.org/jwilder/nginx-proxy) [![](https://img.shields.io/docker/stars/jwilder/nginx-proxy.svg)](https://hub.docker.com/r/jwilder/nginx-proxy 'DockerHub') [![](https://img.shields.io/docker/pulls/jwilder/nginx-proxy.svg)](https://hub.docker.com/r/jwilder/nginx-proxy 'DockerHub')
+![nginx 1.11.3](https://img.shields.io/badge/nginx-1.11.3-brightgreen.svg) ![License MIT](https://img.shields.io/badge/license-MIT-blue.svg) [![Build Status](https://travis-ci.org/jwilder/nginx-proxy.svg?branch=master)](https://travis-ci.org/jwilder/nginx-proxy) [![](https://img.shields.io/docker/stars/jwilder/nginx-proxy.svg)](https://hub.docker.com/r/jwilder/nginx-proxy 'DockerHub') [![](https://img.shields.io/docker/pulls/jwilder/nginx-proxy.svg)](https://hub.docker.com/r/jwilder/nginx-proxy 'DockerHub')
 
 
 
 
 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.
 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.