X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=build%2Ffuel-main_docker_version.patch;h=22b58249b5249f8b89a1b3013eee28e2eba0aad9;hb=a2cc23055bcbf550de2d2f3d2dd8bf0893449853;hp=2976675bd5f3fd540bac0b065bc143d3914774ca;hpb=89d6c9355ef28dcf3d49c781ab47b802254ec858;p=fuel.git

diff --git a/build/fuel-main_docker_version.patch b/build/fuel-main_docker_version.patch
index 2976675bd..22b58249b 100644
--- a/build/fuel-main_docker_version.patch
+++ b/build/fuel-main_docker_version.patch
@@ -1,18 +1,19 @@
-*** prepare-build-env.sh.orig	Fri Dec 18 15:04:43 2015
---- prepare-build-env.sh	Fri Dec 18 15:05:01 2015
+*** 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
 ***************
-*** 104,110 ****
+*** 102,108 ****
+    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.5.0
+!   sudo apt-get -y install lxc-docker-1.5.0
   fi
   
   # Install software
---- 104,110 ----
+--- 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=\"--dns 8.8.8.8 --dns 8.8.4.4 --bip 172.45.0.1/24\" > /etc/default/docker'
+!   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