ref(router): use ubuntu:14.04 as Dockerfile base image

Author: mboersma

router/Dockerfile

@@ -1,20 +1,57 @@
-FROM deis/base:latest
-MAINTAINER OpDemand <info@opdemand.com>
+FROM ubuntu:14.04
 
-RUN apt-get update && \
-    apt-get install -yq patch libpcre3 libpcre3-dev libssl-dev libgeoip-dev
+ENV DEBIAN_FRONTEND noninteractive
+
+# install common packages
+RUN apt-get update && apt-get install -y curl
 
-RUN wget -q http://nginx.org/download/nginx-1.6.2.tar.gz -O /tmp/nginx-1.6.2.tar.gz
-RUN wget -q https://github.com/yaoweibin/nginx_tcp_proxy_module/archive/v0.4.5.tar.gz -O /tmp/tcp-proxy.tar.gz
+# install etcdctl
+RUN curl -sSL -o /usr/local/bin/etcdctl https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 \
+    && chmod +x /usr/local/bin/etcdctl
 
-WORKDIR /tmp
-RUN tar -xzf nginx-1.6.2.tar.gz
-RUN tar -xzf tcp-proxy.tar.gz
+# install confd
+RUN curl -sSL -o /usr/local/bin/confd https://s3-us-west-2.amazonaws.com/opdemand/confd-v0.5.0-json \
+    && chmod +x /usr/local/bin/confd
+
+# install build and runtime packages
+RUN apt-get update && \
+    apt-get install -yq patch libpcre3 libpcre3-dev libssl-dev libgeoip-dev gcc make
 
-WORKDIR /tmp/nginx-1.6.2
-RUN patch -p1 < /tmp/nginx_tcp_proxy_module-0.4.5/tcp.patch
-RUN ./configure --prefix=/var/lib/nginx --sbin-path=/usr/sbin/nginx --conf-path=/etc/nginx/nginx.conf --http-log-path=/var/log/nginx/access.log --error-log-path=/var/log/nginx/error.log --lock-path=/var/lock/nginx.lock --pid-path=/run/nginx.pid --http-client-body-temp-path=/var/lib/nginx/body --http-fastcgi-temp-path=/var/lib/nginx/fastcgi --http-proxy-temp-path=/var/lib/nginx/proxy --http-scgi-temp-path=/var/lib/nginx/scgi --http-uwsgi-temp-path=/var/lib/nginx/uwsgi --with-debug --with-pcre-jit --with-ipv6 --with-http_ssl_module --with-http_stub_status_module --with-http_realip_module --with-http_auth_request_module --with-http_addition_module --with-http_dav_module --with-http_geoip_module --with-http_gzip_static_module --with-http_spdy_module --with-http_sub_module --with-mail --with-mail_ssl_module --add-module=/tmp/nginx_tcp_proxy_module-0.4.5
-RUN make && make install
+# build nginx+tcp_proxy from source
+RUN curl -sSL http://nginx.org/download/nginx-1.6.2.tar.gz | tar -C /tmp -xz
+RUN curl -sSL https://github.com/yaoweibin/nginx_tcp_proxy_module/archive/v0.4.5.tar.gz | tar -C /tmp -xz
+RUN cd /tmp/nginx-1.6.2 \
+    && patch -p1 < /tmp/nginx_tcp_proxy_module-0.4.5/tcp.patch \
+    && ./configure \
+        --prefix=/var/lib/nginx \
+        --sbin-path=/usr/sbin/nginx \
+        --conf-path=/etc/nginx/nginx.conf \
+        --http-log-path=/var/log/nginx/access.log \
+        --error-log-path=/var/log/nginx/error.log \
+        --lock-path=/var/lock/nginx.lock \
+        --pid-path=/run/nginx.pid \
+        --http-client-body-temp-path=/var/lib/nginx/body \
+        --http-fastcgi-temp-path=/var/lib/nginx/fastcgi \
+        --http-proxy-temp-path=/var/lib/nginx/proxy \
+        --http-scgi-temp-path=/var/lib/nginx/scgi \
+        --http-uwsgi-temp-path=/var/lib/nginx/uwsgi \
+        --with-debug \
+        --with-pcre-jit \
+        --with-ipv6 \
+        --with-http_ssl_module \
+        --with-http_stub_status_module \
+        --with-http_realip_module \
+        --with-http_auth_request_module \
+        --with-http_addition_module \
+        --with-http_dav_module \
+        --with-http_geoip_module \
+        --with-http_gzip_static_module \
+        --with-http_spdy_module \
+        --with-http_sub_module \
+        --with-mail \
+        --with-mail_ssl_module \
+        --add-module=/tmp/nginx_tcp_proxy_module-0.4.5 \
+    && make && make install
 
 WORKDIR /app
 EXPOSE 80 2222

router/README.md

@@ -2,22 +2,16 @@
 
 An nginx proxy for use in the [Deis](http://deis.io) open source PaaS.
 
-[![image](https://d207aa93qlcgug.cloudfront.net/img/icons/framed-icon-checked-repository.svg)](https://index.docker.io/u/deis/router/)
+This Docker image is based on the official
+[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
-[**Trusted Build**](https://index.docker.io/u/deis/router/)
-
-This Docker image is based on the trusted build
-[deis/base](https://index.docker.io/u/deis/base/), which itself is based
-on the official [ubuntu:12.04](https://index.docker.io/_/ubuntu/) image.
-
-Please add any issues you find with this software to the
-[Deis project](https://github.com/deis/deis/issues).
+Please add any [issues](https://github.com/deis/deis/issues) you find with this software to
+the [Deis Project](https://github.com/deis/deis).
 
 ## Usage
 
-* `make build` builds the *deis/router* image inside a vagrant VM
-* `make run` installs and starts *deis/router*, then displays log
-  output from the container
+Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
+install, and start **deis/router**.
 
 ## Environment Variables