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_6.patch | |
| parent | 65c164021cb356b3d4e6888488fb62c3395da4f5 (diff) | |
Brahmaputra master sync
Signed-off-by: Stefan Berg <sfb@consultron.com>
Diffstat (limited to 'build/fuel-main_6.patch')
| -rw-r--r-- | build/fuel-main_6.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/build/fuel-main_6.patch b/build/fuel-main_6.patch deleted file mode 100644 index 2659e2d17..000000000 --- a/build/fuel-main_6.patch +++ /dev/null @@ -1,30 +0,0 @@ -*** prepare-build-env.sh.orig Mon Oct 19 13:28:30 2015 ---- prepare-build-env.sh Mon Oct 19 13:29:10 2015 -*************** -*** 87,92 **** ---- 87,93 ---- - 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 -*************** -*** 102,108 **** - sudo apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 36A1D7869245C8950F966E92D8576A8BA88D21E9 - # Install docker - sudo apt-get update -! sudo apt-get -y install lxc-docker-1.5.0 - fi - - # Install software ---- 103,110 ---- - 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 - fi - - # Install software |