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

Author: mboersma

builder/Dockerfile

@@ -1,26 +1,38 @@
-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 docker-in-docker
 RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
 RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
+
 # install builder, docker, and hook dependencies
 RUN apt-get update && apt-get install -yq \
     openssh-server git \
     aufs-tools iptables lxc \
-    curl \
     lxc-docker-1.2.0
 
 # configure ssh server
 RUN rm /etc/ssh/ssh_host_*
 RUN dpkg-reconfigure openssh-server
 RUN mkdir -p /var/run/sshd
 
-# 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 -
 
 # install hook dependencies
-RUN pip install pyyaml requests
+RUN pip install pyyaml==3.11 requests==2.4.1
 
 # install all i18n locales
 RUN ln -s /usr/share/i18n/SUPPORTED /var/lib/locales/supported.d/all && locale-gen
@@ -37,8 +49,8 @@ RUN echo "%git    ALL=(ALL:ALL) NOPASSWD:/home/git/builder" >> /etc/sudoers
 
 # HACK: import progrium/cedarish as a tarball
 # see https://github.com/deis/deis/issues/1027
-RUN wget -O /progrium_cedarish.tar --progress=dot:giga \
-        https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
+RUN curl -#SL -o /progrium_cedarish.tar \
+    https://s3-us-west-2.amazonaws.com/opdemand/progrium_cedarish_cedar.tar
 
 # define the execution environment
 VOLUME /var/lib/docker

builder/README.md

@@ -1,24 +1,17 @@
 # Deis Builder
 
-A Docker image that builds Docker images, for use in the
-[Deis](http://deis.io) open source PaaS.
+A Docker image that builds Docker images, 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/builder/)
+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/builder/)
-
-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/builder* image inside a vagrant VM
-* `make run` installs and starts *deis/builder*, 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/builder**.
 
 ## Environment Variables
 
@@ -29,6 +22,7 @@ Please add any issues you find with this software to the
   its configuration (default: */deis/builder*)
 * **ETCD_TTL** sets the time-to-live before etcd purges a configuration
   value, in seconds (default: *10*)
+* **STORAGE_DRIVER** sets the Docker-in-Docker storage driver (default: btrfs)
 * **PORT** sets the TCP port on which the builder listens (default: *2222*)
 
 ## License