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

Author: mboersma

controller/Dockerfile

@@ -1,14 +1,26 @@
-FROM deis/base:latest
-MAINTAINER OpDemand <info@opdemand.com>
+FROM ubuntu:14.04
+
+ENV DEBIAN_FRONTEND noninteractive
+
+# install common packages
+RUN apt-get update && apt-get install -y curl
+
+# 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
+
+# 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 required system packages
 # HACK: install git so we can install bacongobbler's fork of django-fsm
 # install openssh-client for temporary fleetctl wrapper
 RUN apt-get update && \
     apt-get install -yq python-dev libpq-dev libyaml-dev git openssh-client
 
-# install recent pip
-RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
+# install pip
+RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
 
 # add a deis user that has passwordless sudo (for now)
 RUN useradd deis --groups sudo --home-dir /app --shell /bin/bash

controller/README.md

@@ -1,25 +1,18 @@
 # Deis Controller
 
-A RESTful API server for use in the [Deis](http://deis.io) open
-source PaaS.
+A RESTful API server 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/controller/)
 
-[**Trusted Build**](https://index.docker.io/u/deis/controller/)
+This Docker image is based on the official
+[ubuntu:14.04](https://registry.hub.docker.com/_/ubuntu/) image.
 
-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/controller* image inside a vagrant VM
-* `make run` installs and starts *deis/controller*, then displays log
-  output from the container
-* `make test` runs unit tests for the controller and reports results
+Please consult the [Makefile](Makefile) for current instructions on how to build, test, push,
+install, and start **deis/logger**.
 
 ## Environment Variables