summaryrefslogtreecommitdiffstats
path: root/build
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-27 12:38:42 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-27 12:38:42 +0000
commit0cc989a2376c6f9c8171a556c7fa7869f4635dc6 (patch)
treeda3af916cf230e86589572d44324930be70db4a6 /build
parentb4cc8935a0b22c4104cbeec027a7325afff9b3ae (diff)
parent567c751216af815920caa7a495822aa902a3aa0a (diff)
Merge "Revert "Fix build failure in fuel base & qemu""
Diffstat (limited to 'build')
-rw-r--r--build/Makefile1
-rw-r--r--build/fuel-main_docker_dns.patch18
2 files changed, 0 insertions, 19 deletions
diff --git a/build/Makefile b/build/Makefile
index f77a14538..3d7dd634d 100644
--- a/build/Makefile
+++ b/build/Makefile
@@ -110,7 +110,6 @@ $(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 -f -p0 < $(TOPDIR)/fuel-main_docker_version.patch
- # cd /tmp/fuel-main && patch -f -p0 < $(TOPDIR)/fuel-main_docker_dns.patch
#
cd /tmp/fuel-main && ./prepare-build-env.sh
# Verify that Docker is alive
diff --git a/build/fuel-main_docker_dns.patch b/build/fuel-main_docker_dns.patch
deleted file mode 100644
index 4b2377e47..000000000
--- a/build/fuel-main_docker_dns.patch
+++ /dev/null
@@ -1,18 +0,0 @@
---- 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
-