From 5c7b268e248cc3f05444c38c5915d9268c5d6c4b Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Sat, 2 Jan 2016 20:03:47 +0100 Subject: [PATCH 1/4] Customized version based on jwilder/nginx-proxy! --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index 9d4bb40..54d80dd 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,6 @@ +Customized version based on 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. From aec912e281f9139720ce12bf45f1f820add6a449 Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Sat, 2 Jan 2016 20:17:31 +0100 Subject: [PATCH 2/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 54d80dd..1e6d3a5 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -Customized version based on jwilder/nginx-proxy! +Customized version based on jwilder/nginx-proxy! Just updated to recent versions. ![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) From 0b3c9acc3b449d587f12bb9567b8a7eaa383314b Mon Sep 17 00:00:00 2001 From: Wolfgang Frank Date: Sat, 2 Jan 2016 20:51:13 +0100 Subject: [PATCH 3/4] Updated to use latest versions --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index 4111003..626a7a0 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM nginx:1.9.6 +FROM nginx:1.9.9 MAINTAINER Jason Wilder mail@jasonwilder.com # Install wget and install/updates certificates @@ -17,7 +17,7 @@ RUN echo "daemon off;" >> /etc/nginx/nginx.conf \ RUN wget -P /usr/local/bin https://godist.herokuapp.com/projects/ddollar/forego/releases/current/linux-amd64/forego \ && chmod u+x /usr/local/bin/forego -ENV DOCKER_GEN_VERSION 0.4.2 +ENV DOCKER_GEN_VERSION 0.4.3 RUN wget https://github.com/jwilder/docker-gen/releases/download/$DOCKER_GEN_VERSION/docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ && tar -C /usr/local/bin -xvzf docker-gen-linux-amd64-$DOCKER_GEN_VERSION.tar.gz \ From 54afb25f6fc235c56d4838ac2a797caccc51107a Mon Sep 17 00:00:00 2001 From: Wolfgang Date: Mon, 4 Jan 2016 11:39:15 +0100 Subject: [PATCH 4/4] Removed obsolete remark in Readme --- README.md | 3 --- 1 file changed, 3 deletions(-) diff --git a/README.md b/README.md index 1e6d3a5..9d4bb40 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,3 @@ -Customized version based on jwilder/nginx-proxy! Just updated to recent versions. - - ![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.