diff options
| author |   Stefan Berg <sfb@consultron.com> | 2016-01-29 14:44:43 +0100 |
|---|---|---|
| committer | Stefan Berg <sfb@consultron.com> | 2016-01-29 14:44:43 +0100 |
| commit | 1a560c19021ff232b7869b3057af4bcc46145b40 (patch) | |
| tree | 14cd014dac38ffca567b3e2611a20fc05754f998 /build/fuel-main_docker_version.patch | |
| parent | 65c164021cb356b3d4e6888488fb62c3395da4f5 (diff) | |
Brahmaputra master sync
Signed-off-by: Stefan Berg <sfb@consultron.com>
Diffstat (limited to 'build/fuel-main_docker_version.patch')
| -rw-r--r-- | build/fuel-main_docker_version.patch | 15 |
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 |