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

Author: mboersma

tests/bin/prime-docker-images.sh

@@ -11,7 +11,7 @@ docker rm `docker ps -a -q`
 docker rmi -f `docker images -q`
 
 # Pull Deis testing essentials
-docker pull deis/base:latest
+docker pull ubuntu:14.04
 docker pull deis/slugbuilder:latest
 docker pull deis/slugrunner:latest
 docker pull deis/test-etcd:latest

tests/bin/setup-node.sh

@@ -29,7 +29,7 @@ echo 'export PATH=$PATH:/usr/local/go/bin' >> /etc/profile
 
 # install test suite requirements
 apt-get install -yq python-dev libpq-dev libyaml-dev git postgresql postgresql-client
-RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
+RUN curl -sSL https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
 pip install virtualenv
 
 # create jenkins user and install node bootstrap script

tests/etcdutils/Dockerfile

@@ -1,8 +1,13 @@
-FROM ubuntu:12.04
+FROM ubuntu:14.04
 
-# Download etcdctl binary -- keep in sync with CoreOS' version.
-ADD https://s3-us-west-2.amazonaws.com/opdemand/etcdctl-v0.4.6 /usr/local/bin/etcdctl
-RUN chmod +x /usr/local/bin/etcdctl
+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
 
 # build etcd and then clean up
 RUN buildDeps='curl git-core'; \