Skip to content

Commit 18603e3

Browse files
committed
Merge pull request #907 from deis/install-new-pip
chore(controller): install new pip 1.5.5
2 parents df7a2c6 + c0f7b74 commit 18603e3

3 files changed

Lines changed: 3 additions & 3 deletions

File tree

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ RUN apt-get update -qy
1919
RUN apt-get install -yq lxc-docker-0.10.0
2020

2121
# install recent pip
22-
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
22+
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
2323

2424
# install hook dependencies
2525
RUN pip install pyyaml requests

controller/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ RUN apt-get update && \
66
apt-get install -yq python-dev libpq-dev libyaml-dev
77

88
# install recent pip
9-
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
9+
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
1010

1111
# HACK: install git so we can install bacongobbler's fork of django-fsm
1212
RUN apt-get install -yq git

registry/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ RUN apt-get install -y git-core build-essential python-dev \
77
libevent-dev python-openssl liblzma-dev wget
88

99
# install recent pip
10-
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
10+
RUN wget -qO- https://raw.githubusercontent.com/pypa/pip/1.5.5/contrib/get-pip.py | python -
1111

1212
# create a registry user
1313
RUN useradd -s /bin/bash registry

0 commit comments

Comments
 (0)