From 8c6ec27547fe7ac51d9f07975d7b0533558c0334 Mon Sep 17 00:00:00 2001 From: Gabriel Baker Date: Tue, 23 Feb 2016 07:23:27 +0000 Subject: [PATCH 1/3] Mention the docker-compose issues --- README.md | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/README.md b/README.md index 9d4bb40..4be79df 100644 --- a/README.md +++ b/README.md @@ -18,6 +18,11 @@ The containers being proxied must [expose](https://docs.docker.com/reference/run Provided your DNS is setup to forward foo.bar.com to the a host running nginx-proxy, the request will be routed to a container with the VIRTUAL_HOST env var set. +### Docker-compose + +Currently this does not work with the new v2 syntax of docker-compose (due to not being compatible with the new network overlay see #304). It does work when using the old docker-composer syntax. + + ### Multiple Ports If your container exposes multiple ports, nginx-proxy will default to the service running on port 80. If you need to specify a different port, you can set a VIRTUAL_PORT env var to select a different one. If your container only exposes one port and it has a VIRTUAL_HOST env var set, that port will be selected. From d849e5f5d04114c3cff2855a5cac4b702f98b89b Mon Sep 17 00:00:00 2001 From: Gabriel Baker Date: Tue, 23 Feb 2016 07:25:32 +0000 Subject: [PATCH 2/3] Linkify the issue ref --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4be79df..efb8ed1 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Provided your DNS is setup to forward foo.bar.com to the a host running nginx-pr ### Docker-compose -Currently this does not work with the new v2 syntax of docker-compose (due to not being compatible with the new network overlay see #304). It does work when using the old docker-composer syntax. +Currently this does not work with the new v2 syntax of docker-compose (due to not being compatible with the new network overlay see [#304](https://github.com/jwilder/nginx-proxy/issues/304)). It does work when using the old docker-composer syntax. ### Multiple Ports From 1f8b480365edc8b943b5482a0134badbaac3d154 Mon Sep 17 00:00:00 2001 From: Mike Rohland Date: Mon, 21 Mar 2016 22:47:01 +0100 Subject: [PATCH 3/3] moved nginx to 1.9.12 --- Dockerfile | 2 +- README.md | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/Dockerfile b/Dockerfile index 8cb98cd..ce586bd 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.9.9 +FROM nginx:1.9.12 MAINTAINER Jason Wilder mail@jasonwilder.com # Install wget and install/updates certificates diff --git a/README.md b/README.md index efb8ed1..76e9987 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -![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 1.9.12](https://img.shields.io/badge/nginx-1.9.12-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. @@ -232,4 +232,3 @@ Before submitting pull requests or issues, please check github to make sure an e To run tests, you'll need to install [bats 0.4.0](https://github.com/sstephenson/bats). make test -