blob: 22b58249b5249f8b89a1b3013eee28e2eba0aad9 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
|
*** prepare-build-env.sh.orig 2016-01-11 14:55:50.615286910 +0100
--- prepare-build-env.sh 2016-01-11 14:59:44.775308422 +0100
***************
*** 102,108 ****
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
# Install docker
sudo apt-get update
! sudo apt-get -y install lxc-docker-1.5.0
fi
# Install software
--- 102,109 ----
sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9
# Install docker
sudo apt-get update
! sudo sh -c 'echo DOCKER_OPTS=\"--bip 172.45.0.1/24\" > /etc/default/docker'
! sudo apt-get -y -o Dpkg::Options::="--force-confold" install lxc-docker-1.7.1
fi
# Install software
|
