thib8956/nginx-proxy
1
0
Fork 0
mirror of https://github.com/thib8956/nginx-proxy synced 2024-11-22 03:46:29 +00:00
Code Issues Releases Wiki Activity

Merge pull request #732 from matt-hh/feature/upgrade-1.11.10

Browse Source 
Upgrade to nginx 1.11.10
This commit is contained in:
Jason Wilder 2017-02-21 10:18:23 -07:00 committed by GitHub
commit 6554a1cf28
4 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Dockerfile
View File

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

2
Dockerfile.alpine
View File

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

4
README.md
View File

@ -1,4 +1,4 @@
![nginx 1.11.9](https://img.shields.io/badge/nginx-1.11.9-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.10](https://img.shields.io/badge/nginx-1.11.10-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.
@ -343,4 +343,4 @@ If your system has the `make` command, you can automate those tasks by calling:
make test
You can learn more about how the test suite works and how to write new tests in the [test/README.md](test/README.md) file.
You can learn more about how the test suite works and how to write new tests in the [test/README.md](test/README.md) file.

1
docker-compose.yml
View File

@ -12,4 +12,3 @@ services:
image: jwilder/whoami
environment:
- VIRTUAL_HOST=whoami.local