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

Author: mboersma

registry/Dockerfile

@@ -1,13 +1,25 @@
-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 packages (copied from dotcloud/docker-registry Dockerfile)
 RUN sed -i 's/main$/main universe/' /etc/apt/sources.list
 RUN apt-get update && apt-get install -y git-core build-essential python-dev \
-    libevent-dev python-openssl liblzma-dev wget
+    libevent-dev python-openssl liblzma-dev
 
-# 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 -
 
 # create a registry user
 RUN useradd -s /bin/bash registry

registry/README.md

@@ -1,24 +1,17 @@
 # Deis Registry
 
-A Docker image registry for use in the [Deis](http://deis.io) open
-source PaaS.
+A Docker image registry 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/registry/)
+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/registry/)
-
-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/registry* image inside a vagrant VM
-* `make run` installs and starts *deis/registry*, 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/registry**.
 
 ## Environment Variables