Skip to content

Commit b788551

Browse files
author
Matthew Fisher
committed
Merge pull request #651 from opdemand/548-update-docker
bump docker to v0.9.0
2 parents 784ecd9 + 451711b commit b788551

7 files changed

Lines changed: 7 additions & 7 deletions

File tree

builder/Dockerfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ RUN apt-get install -yq aufs-tools iptables ca-certificates lxc
1414
RUN echo "deb http://get.docker.io/ubuntu docker main" > /etc/apt/sources.list.d/docker.list
1515
RUN apt-key adv --keyserver keyserver.ubuntu.com --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
1616
RUN apt-get update -q
17-
RUN apt-get install -yq lxc-docker-0.8.0
17+
RUN apt-get install -yq lxc-docker-0.9.0
1818

1919
# install recent pip
2020
RUN wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -

contrib/digitalocean/prepare-controller-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ apt-get upgrade -yq
2828
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
2929

3030
# install required packages
31-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
31+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3232

3333
# wait for docker to start
3434
while [ ! -e /var/run/docker.sock ] ; do

contrib/digitalocean/prepare-node-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ apt-get upgrade -yq
2828
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
2929

3030
# install required packages
31-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
31+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3232

3333
# wait for docker to start
3434
while [ ! -e /var/run/docker.sock ] ; do

contrib/ec2/prepare-controller-ami.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apt-get dist-upgrade -yq
3333
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
3434

3535
# install required packages
36-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
36+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3737

3838
# wait for docker to start
3939
while [ ! -e /var/run/docker.sock ] ; do

contrib/ec2/prepare-node-ami.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ apt-get dist-upgrade -yq
3333
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
3434

3535
# install required packages
36-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
36+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3737

3838
# wait for docker to start
3939
while [ ! -e /var/run/docker.sock ] ; do

contrib/rackspace/prepare-node-image.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ apt-get dist-upgrade -yq
3434
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
3535

3636
# install required packages
37-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
37+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3838

3939
# wait for docker to start
4040
while [ ! -e /var/run/docker.sock ] ; do

contrib/vagrant/prepare-ubuntu-box.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ apt-get dist-upgrade -yq
3535
wget -qO- https://raw.github.com/pypa/pip/1.5.4/contrib/get-pip.py | python -
3636

3737
# install required packages
38-
apt-get install lxc-docker-0.8.0 fail2ban curl git inotify-tools make -yq
38+
apt-get install lxc-docker-0.9.0 fail2ban curl git inotify-tools make -yq
3939

4040
# wait for docker to start
4141
while [ ! -e /var/run/docker.sock ] ; do

0 commit comments

Comments
 (0)