summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRuijing Guo <ruijing.guo@intel.com>2016-01-07 05:17:37 +0000
committerJonas Bjurel <jonas.bjurel@ericsson.com>2016-01-13 12:59:30 +0000
commitb89b797ced3cd818ddce1d1d724d240bc27e93c3 (patch)
tree5876a37f7c0e22168bcc6187cb82f007d2be4577
parente9f94201817c842f0956cbc295ba59040156089c (diff)
Fix build failure in fuel base & qemu
Change-Id: I4a6cc047011547402641619a5683af3d24c057ee Signed-off-by: Ruijing Guo <ruijing.guo@intel.com>
-rw-r--r--build/Makefile1
-rw-r--r--build/fuel-main_docker_dns.patch18
2 files changed, 19 insertions, 0 deletions
diff --git a/build/Makefile b/build/Makefile
index 542269617..d58f3ad76 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -94,6 +94,7 @@ $(ISOCACHE):
# Need to replace the old Docker v. 1.5.0 with a later version to be
# able to access the Docker remote repository!
cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_version.patch
+ cd /tmp/fuel-main && patch -p0 < $(TOPDIR)/fuel-main_docker_dns.patch
#
cd /tmp/fuel-main && ./prepare-build-env.sh
cd /tmp/fuel-main && make repos
diff --git a/build/fuel-main_docker_dns.patch b/build/fuel-main_docker_dns.patch
new file mode 100644
index 000000000..4b2377e47
--- /dev/null
+++ b/build/fuel-main_docker_dns.patch
@@ -0,0 +1,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
+