Install latest pip.

Author: mboersma

builder/Dockerfile

@@ -16,8 +16,11 @@ RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F9
 RUN apt-get update -q
 RUN apt-get install -yq lxc-docker-0.8.0
 
+# install latest pip
+RUN wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install hook dependencies
-RUN apt-get install -yq python-pip
 RUN pip install pyyaml requests
 
 # install hook utilities

contrib/digitalocean/prepare-controller-image.sh

@@ -24,8 +24,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

contrib/digitalocean/prepare-node-image.sh

@@ -24,8 +24,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

contrib/ec2/prepare-controller-ami.sh

@@ -29,8 +29,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

contrib/ec2/prepare-node-ami.sh

@@ -29,8 +29,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

contrib/rackspace/prepare-node-image.sh

@@ -30,8 +30,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

contrib/vagrant/prepare-ubuntu-box.sh

@@ -31,8 +31,12 @@ echo deb https://get.docker.io/ubuntu docker main > /etc/apt/sources.list.d/dock
 apt-get update
 apt-get dist-upgrade -yq
 
+# install latest pip
+wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 # install required packages
-apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make python-setuptools python-pip -yq
+apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
 
 # wait for docker to start
 while [ ! -e /var/run/docker.sock ] ; do

controller/Dockerfile

@@ -3,7 +3,11 @@ MAINTAINER Gabriel A. Monroy <gabriel@opdemand.com>
 
 # install required system packages
 RUN apt-get update
-RUN apt-get install -yq python-pip python-dev libpq-dev
+RUN apt-get install -yq python-dev libpq-dev
+# install latest pip
+RUN wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 
 # install chef
 RUN apt-get install -yq ruby1.9.1 rubygems

registry/Dockerfile

@@ -5,7 +5,10 @@ MAINTAINER Gabriel Monroy <gabriel@opdemand.com>
 RUN sed -i 's/main$/main universe/' /etc/apt/sources.list && apt-get update
 RUN apt-get install -y git-core build-essential python-dev \
     libevent-dev python-openssl liblzma-dev wget
-RUN apt-get install -yq python-pip
+# install latest pip
+RUN wget -q https://raw.github.com/pypa/pip/master/contrib/get-pip.py && \
+    python get-pip.py && \
+    rm get-pip.py
 
 # create a registry user
 RUN useradd -s /bin/bash registry