blob: 4b2377e47a773301f8463ba5b57d8e564612ed94 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
|
--- prepare-build-env.sh.orig 2016-01-06 08:11:29.749933262 +0000
+++ prepare-build-env.sh 2016-01-06 08:11:41.785790127 +0000
@@ -87,7 +87,6 @@
echo "Docker is running."
else
echo "Process is not running, starting it..."
- sudo sh -c 'echo DOCKER_OPTS=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" >> /etc/default/docker*'
sudo service docker start
fi
else
@@ -103,7 +102,6 @@
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=\"--dns 8.8.8.8 --dns 8.8.4.4 --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
|
