summaryrefslogtreecommitdiffstats
path: root/build/fuel-main_docker_version.patch
diff options
context:
space:
mode:
authorStefan K. Berg <stefan.k.berg@ericsson.com>2016-01-17 19:18:58 +0000
committerGerrit Code Review <gerrit@172.30.200.206>2016-01-17 19:18:59 +0000
commit58ab9100f56b4252578c9c13cb8060d87285f1ba (patch)
tree8294e825620f38d7be12875b0bb3e7db0aa7683e /build/fuel-main_docker_version.patch
parent76aa5bd1daf9568ab91f7586b0627062ffb26fb0 (diff)
parent8e599759ede512a773eccef59eb2824940307564 (diff)
Merge "Fuel 8 uplift"
Diffstat (limited to 'build/fuel-main_docker_version.patch')
-rw-r--r--build/fuel-main_docker_version.patch15
1 files changed, 8 insertions, 7 deletions
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