From 9df9df59769981851ae21bc4385e5cee009a09d0 Mon Sep 17 00:00:00 2001
From: Dave Thomas <dave@delicious.com>
Date: Mon, 11 Jan 2016 10:01:53 -0800
Subject: [PATCH 1/3] Use nginx-extras, not maintained by
 docker-maint@nginx.com because this version may not include a -extras package

---
 Dockerfile | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index d0c7f410..086cb325 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,13 +1,11 @@
 FROM debian:jessie
 
-MAINTAINER NGINX Docker Maintainers "docker-maint@nginx.com"
-
-ENV NGINX_VERSION 1.9.9-1~jessie
+MAINTAINER Dave Thomas "opensource@peoplemerge.com"
 
 RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
 	&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \
 	&& apt-get update \
-	&& apt-get install -y ca-certificates nginx=${NGINX_VERSION} gettext-base \
+	&& apt-get install -y ca-certificates nginx-extras gettext-base \
 	&& rm -rf /var/lib/apt/lists/*
 
 # forward request and error logs to docker log collector

From 390a56c8154dde8547da752eeb5ba93a6d061a32 Mon Sep 17 00:00:00 2001
From: Dave Thomas <dave@delicious.com>
Date: Mon, 11 Jan 2016 11:55:17 -0800
Subject: [PATCH 2/3] Reverting to dockerfile base -- debian package is just
 too hard to work with

---
 Dockerfile | 49 +++++++++++++++++++++++++++++++++++++------------
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 086cb325..67a83a2e 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,17 +1,42 @@
-FROM debian:jessie
+# Was FROM debian:jessie
+# WAS forked from nginx/nginx
+# can't figure out how to get -extras which has perl-embedded
+# going back to dockerfile even though it's deprecated; at least it works
 
-MAINTAINER Dave Thomas "opensource@peoplemerge.com"
+# Pull base image.
 
-RUN apt-key adv --keyserver hkp://pgp.mit.edu:80 --recv-keys 573BFD6B3D8FBC641079A6ABABF5BD827BD9BF62 \
-	&& echo "deb http://nginx.org/packages/mainline/debian/ jessie nginx" >> /etc/apt/sources.list \
-	&& apt-get update \
-	&& apt-get install -y ca-certificates nginx-extras gettext-base \
-	&& rm -rf /var/lib/apt/lists/*
+# WAS dockerfile/ubuntu
+FROM ubuntu:14.04
 
-# forward request and error logs to docker log collector
-RUN ln -sf /dev/stdout /var/log/nginx/access.log \
-	&& ln -sf /dev/stderr /var/log/nginx/error.log
+# Install.
+RUN \
+  sed -i 's/# \(.*multiverse$\)/\1/g' /etc/apt/sources.list && \
+  apt-get update && \
+  apt-get -y upgrade && \
+  apt-get install -y build-essential && \
+  apt-get install -y software-properties-common && \
+  apt-get install -y byobu curl git htop man unzip vim wget 
 
-EXPOSE 80 443
 
-CMD ["nginx", "-g", "daemon off;"]
+# WAS From: dockerfile/nginx
+# Install Nginx.
+RUN \
+  add-apt-repository -y ppa:nginx/stable && \
+  apt-get update && \
+  apt-get install -y nginx && \
+  rm -rf /var/lib/apt/lists/* && \
+  echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
+  chown -R www-data:www-data /var/lib/nginx
+
+# Define mountable directories.
+VOLUME ["/etc/nginx/sites-enabled", "/etc/nginx/certs", "/etc/nginx/conf.d", "/var/log/nginx", "/var/www/html"]
+
+# Define working directory.
+WORKDIR /etc/nginx
+
+# Define default command.
+CMD ["nginx"]
+
+# Expose ports.
+EXPOSE 80
+EXPOSE 443

From c67a7e4eb51422b265ce22f985739a5a9c546929 Mon Sep 17 00:00:00 2001
From: Dave Thomas <dave@delicious.com>
Date: Mon, 11 Jan 2016 13:37:31 -0800
Subject: [PATCH 3/3] use nginx-extras

---
 Dockerfile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Dockerfile b/Dockerfile
index 67a83a2e..72a3fa9c 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -23,7 +23,7 @@ RUN \
 RUN \
   add-apt-repository -y ppa:nginx/stable && \
   apt-get update && \
-  apt-get install -y nginx && \
+  apt-get install -y nginx-extras && \
   rm -rf /var/lib/apt/lists/* && \
   echo "\ndaemon off;" >> /etc/nginx/nginx.conf && \
   chown -R www-data:www-data /var/lib/nginx