From 46b16bede8b492101f10072e6b03b79178797479 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Tue, 27 Jan 2015 18:25:02 +0000 Subject: [PATCH 1/2] Creating stable branch release, Nginx 1.6.2 --- Dockerfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Dockerfile b/Dockerfile index a8228ad..506bcdb 100644 --- a/Dockerfile +++ b/Dockerfile @@ -11,8 +11,8 @@ ENV DEBIAN_FRONTEND noninteractive # Add sources for latest nginx RUN apt-get install -y wget RUN wget -q http://nginx.org/keys/nginx_signing.key -O- | sudo apt-key add - -RUN echo deb http://nginx.org/packages/mainline/ubuntu/ trusty nginx >> /etc/apt/sources.list -RUN echo deb-src http://nginx.org/packages/mainline/ubuntu/ trusty nginx >> /etc/apt/sources.list +RUN echo deb http://nginx.org/packages/ubuntu/ trusty nginx >> /etc/apt/sources.list +RUN echo deb-src http://nginx.org/packages/ubuntu/ trusty nginx >> /etc/apt/sources.list # Update System RUN apt-get update From a7498964139ced1f91fe386c8d5a0951cbbcf3a8 Mon Sep 17 00:00:00 2001 From: Ric Harvey Date: Sun, 22 Feb 2015 17:00:35 +0000 Subject: [PATCH 2/2] Updated Readme to reflect mainline version --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 14247a9..4769761 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ If you have any improvements please submit a pull request. The Docker hub build can be found here: [https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/](https://registry.hub.docker.com/u/richarvey/nginx-php-fpm/) ## Nginx Versions -- Mainline Version: **1.7.9** +- Mainline Version: **1.7.10** - Stable Version: **1.6.2** - *Latest = Mainline Version*